部分bug提交

config/index.js

@@ -46,7 +46,7 @@ module.exports = {
       }
     },
     // Various Dev Server settingsss
-    host: "192.168.31.194", // can be overwritten by process.env.HOST
+    host: "192.168.31.193", // 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/components/Coupons/index.vue

@@ -1,92 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="dialogVisible" width="1500px">
-    <el-table :data="list"  max-height="800" @row-click="rowClick" v-loading="listLoading" :element-loading-text="elementLoadingText" class="margin-top-xs" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}">
-      <el-table-column width="30px">
-        <template slot-scope="scope">
-          <el-radio v-model="radio" :label="scope.row.id" @change.native="scope.row;">
-          </el-radio>
-        </template>
-      </el-table-column>
-      <el-table-column label="优惠卷名称"></el-table-column>
-      <el-table-column label="优惠方式"></el-table-column>
-      <el-table-column label="优惠限制(是否满减)" width="150px"></el-table-column>
-      <el-table-column label="优惠金额/折扣"></el-table-column>
-      <el-table-column label="适用门店"></el-table-column>
-      <el-table-column label="适用项目"></el-table-column>
-      <el-table-column label="有效日期(固定)"></el-table-column>
-      <el-table-column label="是否领取"></el-table-column>
-      <el-table-column label="领取日期"></el-table-column>
-      <el-table-column label="领取几天生效"></el-table-column>
-      <el-table-column label="过期时间"></el-table-column>
-    </el-table>
-    <div class="block" style="margin-top:15px;">
-      <!-- 分页组件 -->
-      <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button size="mini" type="primary" plain @click="handleEmpty">取 消</el-button>
-      <el-button size="mini" type="primary" @click="handleCoupons">确 定
-      </el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-    props:{
-        title:{
-            type:String,
-            default:"优惠卷"
-        }
-    },
-    data () {
-        return {
-            dialogVisible:true,
-            listLoading:false,
-            elementLoadingText:"数据加载中",
-            list:[{id:1},{id:2}],
-            radio:null,
-            selectTabArr:[],
-            total:0,
-            queryForm: {
-              pageSize: 10,
-              pageNum: 1,
-            },
-        }
-    },
-    methods:{
-        // 清空选项
-        handleEmpty(){
-            // 清空选项/数组/显示
-            this.dialogVisible = false
-            this.radio = null
-            this.selectTabArr = null
-        },
-        updataIshow(){
-            this.dialogVisible = true
-        },
-        // 处理
-        handleCoupons(){
-            // this.$emit('',this.selectTabArr)
-            // this.handleEmpty()
-        },
-        // 单选
-        rowClick(row){
-            this.radio = row.id
-            this.selectTabArr = [{...row}]
-        },
-        // 切换条
-        handleSizeChange(val) {
-          this.queryForm.pageSize = val;
-        },
-        // 切换页
-        handleCurrentChange(val) {
-          this.queryForm.pageNum = val;
-        }, 
-    },   
-}
-</script>
- 
-<style scoped>
-    
-</style>

src/layout/components/asider.vue

@@ -7,12 +7,12 @@
     <el-menu :default-active="indexPath" :default-openeds="openeds" :unique-opened='true' class="el-menu-vertical-demo max-height-95" @select="open" @open="handleOpen" @close="handleClose" :collapse="collapse" active-text-color="#5e9af5" text-color="white">
       <!-- 循环遍历列表 -->
       <template>
-        <el-submenu v-for="(item,index) in menuList" :key="item.id" :index="item.index" v-role='item.number' id="icon">
+        <el-submenu v-for="(item) in menuList" :key="item.id" :index="item.index" v-role='item.number' id="icon">
           <template slot="title">
             <i :class="item.icon"></i>
             <span slot="title">{{item.name}}</span>
           </template>
-          <router-link v-for="(items,indexs) in item.menuLists" :key="items.id" :to="items.route" v-role='items.number' tag="p">
+          <router-link v-for="(items) in item.menuLists" :key="items.id" :to="items.route" v-role='items.number' tag="p">
             <el-menu-item :index="items.index" @click="rowClick(items)">
               <i :class="items.icon"></i>
               <span slot="title">{{items.name}}</span>

src/pages/eashier/reatment/reatment.vue

@@ -77,13 +77,15 @@
           </div>
         </el-form-item>
         <el-form-item label="待付金额:">
-          <div class="form-width-xl padding-rigth-xs">
+          <div class="form-width-xl padding-rigth-xs" style="width:120px">
-            <span class="text-cyan text-price">{{form.debtMoney>0?form.debtMoney:form.debtMoney<0?'超出'+form.debtMoney*-1:0}}</span>
+            <!-- <span class="text-cyan text-price">{{ form.debtMoney>0?form.debtMoney:(form.debtMoney<0?'超出'+form.debtMoney*-1:0) }}</span> -->
+            <span class="text-cyan text-price">{{ treatAmount }}</span>
           </div>
         </el-form-item>
         <el-form-item label="实付金额:">
           <div class="text-red text-price">
-            {{ form.courseReatmentAmount }}
+            <!-- {{ form.courseReatmentAmount }} -->
+            {{ paidAmount }}
           </div>
         </el-form-item><br />
         <el-form-item label v-show="sessionStorageData.course">
@@ -122,7 +124,7 @@
                       {{ scope.row.spendMoney }}
                       <i class="el-icon-edit text-cyan"></i>
                     </div>
-                    <el-input v-focus type="number" class="form-input-width-xs" @change="endEditCard(scope.row)" @blur="endEditCard(scope.row)" v-else v-model.lazy="scope.row.spendMoney" precision="2"></el-input>
+                    <el-input v-focus oninput ="value=value.replace(/[^\d]/g,'')" class="form-input-width-xs" @change="endEditCard(scope.row)" @blur="endEditCard(scope.row)" v-else v-model.lazy="scope.row.spendMoney" precision="2"></el-input>
                   </template>
                 </el-table-column>
                 <!-- <el-table-column align="center" prop="discoutMoney" label="抵扣支付" width="90">
@@ -512,6 +514,7 @@ export default {
         integralMoney: 0,
         consumeIntegral: 0,
         debtMoney: 0,
+        amount:0
       },
       headOffice: sessionStorage.getItem("headOffice") * 1,
       pageInfo: {
@@ -541,6 +544,69 @@ export default {
       },
     };
   },
+  computed:{
+    // 待付金额
+    treatAmount(){
+      // 需要转换类型(字符串拼接需要转数值)
+      let cardAmount = 0 //卡付金额
+      let cashAmount = 0 //现金金额
+      if(this.rechargeAccountList.length){
+        // 允许卡付，金额累加
+        cardAmount = this.rechargeAccountList.reduce((pre,item)=>{
+          if(item.spendMoney){
+            return pre + Number(item.spendMoney)
+          }else return pre
+        },0)
+      }
+      if(this.payLists.length){
+        // 允许现金付
+        cashAmount = this.payLists.reduce((pre,item)=>{
+        if(item.payMoney){
+          return pre + Number(item.payMoney)
+        }else{
+          return pre
+        }
+      },0)
+      }
+      // 比成交金额低,返回待付金额,大于成交金额,返回超出
+      let num = Number(cardAmount + cashAmount)
+      let amount = Number(this.form.amount)
+      if(!amount){
+        // 初始化金额为0
+        return 0
+      }
+      if(amount>=num){
+        return (amount - num).toFixed(2)
+      }else{
+        return '超出'+( (num -  amount).toFixed(2) ) + '元'
+      }
+    },
+    // 实付金额
+    paidAmount(){
+      // 需要转换类型(字符串拼接需要转数值)
+      let cardAmount = 0 //卡付金额
+      let cashAmount = 0 //现金金额
+      if(this.rechargeAccountList.length){
+        // 允许卡付，金额累加
+        cardAmount = this.rechargeAccountList.reduce((pre,item)=>{
+          if(item.spendMoney){
+            return pre + Number(item.spendMoney)
+          }else return pre
+        },0)
+      }
+      if(this.payLists.length){
+        // 允许现金付
+        cashAmount = this.payLists.reduce((pre,item)=>{
+        if(item.payMoney){
+          return pre + Number(item.payMoney)
+        }else{
+          return pre
+        }
+      },0)
+      }
+      return (Number(cardAmount+cashAmount)).toFixed(2)
+    }
+  },
   methods: {
     close() {
       this.listDialogVisible = false;
@@ -902,6 +968,16 @@ export default {
       this.form.debtMoney = this.form.debtMoney.toFixed(2) * 1;
       this.moneyRatio =
         (this.form.salesPrice / this.proForm.priceMember).toFixed(2) * 100;
+      this.resetAmount()
+    },
+    //重新计算支付
+    resetAmount(){
+      this.payLists.forEach(item=>{
+        item.payMoney = 0
+      })
+      this.rechargeAccountList.forEach(item=>{
+        item.spendMoney = 0
+      })
     },
     //修改购买次数
     numbertimes() {
@@ -918,6 +994,7 @@ export default {
             2
           ) * 1;
         this.form.debtMoney = this.form.amount;
+        this.resetAmount()
       }
     },
     //选择金额.
@@ -932,6 +1009,10 @@ export default {
         if (!row.payMoney) {
           row.payMoney = 0;
         }
+        // 多加层判断，现金不可能付负数,如果是负数清0！！！
+        if(row.payMoney<=0){
+          row.payMoney = 0
+        }
         row.isShow = true;
       } else {
         this.$message.info({
@@ -945,6 +1026,10 @@ export default {
       } else {
         row.payMoney = 0;
       }
+      // 多加层判断，现金不可能付负数,如果是负数清0！！！
+      if(row.payMoney<=0){
+         row.payMoney = 0;
+      }
       row.isShow = false;
       this.num();
     },
@@ -1169,6 +1254,10 @@ export default {
 
     //保存确定方法
     save() {
+      // -- 之前的人写的臭的飞起,没有用到这个字段,保存的时候重新赋值金额（待付/实付）
+      this.form.courseReatmentAmount = this.paidAmount
+      this.form.debtMoney = this.treatAmount
+      // ----
       this.form.isAddition = this.isAddition;
       var staffLists = [];
       this.staffLists.forEach((item) => {

src/pages/eashier/service/service.vue

@@ -295,11 +295,9 @@
     <repayment ref="repayment" @repaymentData="inputMember"></repayment>
     <addmember ref="addmember"></addmember>
     <orders ref="orders"></orders>
-    <!-- <Coupons ref="Coupons" /> -->
   </div>
 </template>
 <script>
-import Coupons from '@/components/Coupons'
 import addmember from "@/components/member/edit/index";
 import {
   selectList,
@@ -338,7 +336,6 @@ export default {
     repayment,
     recash,
     orders,
-    Coupons
   },
   data() {
     return {

src/pages/promotion/group/index.vue

@@ -494,7 +494,6 @@ export default {
           this.list = res.pageInfo.list;
           this.total = res.pageInfo.total;
           this.list = this.list.reverse();
-          console.log(this.list);
         } else {
           this.$alert(res.message, "提示", {
             confirmButtonText: "确定",

src/pages/storeManage/memberList/memberList.vue

@@ -530,7 +530,6 @@ export default {
             this.$message.success({ message: "已刷新最新数据" });
             this.refreshtext = false;
           }
-
           res.pageInfo.tableList = res.pageInfo.list;
           this.pageInfo = res.pageInfo;
         } else {

src/pages/storeManage/trading/components/cash.vue

@@ -13,6 +13,11 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="100" label="支付方式">
+        <template slot-scope="scope">
+          <span>{{ scope.row.rechargeConsumeList.length?'卡付':'现金' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column show-overflow-tooltip align="center" label="单据">
         <el-table-column show-overflow-tooltip align="center" min-width="100" prop="docNum" label="单据号"></el-table-column>
         <el-table-column show-overflow-tooltip align="center" min-width="115" prop="inputDate" label="时间">
@@ -20,7 +25,6 @@
             <div>{{scope.row.isAddition==1?'(补)':''}}{{scope.row.inputDate}}</div>
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip align="center" min-width="100" prop="storeNum" label="门店编码"></el-table-column>
         <el-table-column show-overflow-tooltip align="center" min-width="130" prop="storeName" label="门店名称"></el-table-column>
       </el-table-column>
       <el-table-column show-overflow-tooltip align="center" label="交易">

src/router/index.js

@@ -590,7 +590,7 @@ const router = new VueRouter({
           component: () =>
             import("../pages/statistics/staffBrokerage/staffBrokerage.vue"),
           meta: {
-            title: "员工提成表",
+            title: "员工业绩提成表",
             index: "staffBrokerage"
           }
         },