diff --git a/config/index.js b/config/index.js
index 6c908b7..5a5e1cd 100644
--- a/config/index.js
+++ b/config/index.js
@@ -26,7 +26,8 @@ module.exports = {
     assetsPublicPath: "/",
     proxyTable: {
       "/api": {
-         target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
+        //  target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
+         target: "http://192.168.31.177:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         //target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         // target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         // target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式
diff --git a/src/api/storeManage.js b/src/api/storeManage.js
index 595e36f..1dedf30 100644
--- a/src/api/storeManage.js
+++ b/src/api/storeManage.js
@@ -5,6 +5,8 @@ import {
   localPath
 } from "./api.js";
 
+
+
 // 获取某门店参数
 export function allStores(data){
   return service({
@@ -14,6 +16,24 @@ export function allStores(data){
   })
 }
 
+// 获取超级密码验证码
+export function getStoreId(data){
+  return service({
+    url: "/api" + '/demay/ssm/staffLogin/getDynamicPsw',
+    method: "post",
+    data
+  })
+}
+
+// 动态密码登录
+export function DynamicLoginNews(data){
+  return service({
+    url: "/api" + '/demay/ssm/staffLogin/DynamicLoginNews',
+    method: "post",
+    data
+  })
+}
+
 // 同步总店数据
 export function totalData(params){
   return service({
diff --git a/src/components/staffList/staff/index.vue b/src/components/staffList/staff/index.vue
index e9572b2..1b1bf53 100644
--- a/src/components/staffList/staff/index.vue
+++ b/src/components/staffList/staff/index.vue
@@ -16,7 +16,7 @@
         <template slot-scope="scope">
           <div class="form-input-width" v-if="editIndex != scope.$index"
             @click="openStaffRatio(scope.$index, scope.row)">
-            {{ scope.row.ratio }}
+            {{ scope.row.ratio?scope.row.ratio.toFixed(2)*1:0 }}
             <i class="el-icon-edit text-cyan" v-if="scope.$index != 0"></i>
           </div>
           <el-input v-focus class="form-input-width-xs" size="samll" type="number" v-else v-model="scope.row.ratio" @blur="endStaffRatio(scope.row, scope.$index)"></el-input>
diff --git a/src/login/components/superPassword.vue b/src/login/components/superPassword.vue
new file mode 100644
index 0000000..e1ab013
--- /dev/null
+++ b/src/login/components/superPassword.vue
@@ -0,0 +1,178 @@
+<template>
+<el-dialog
+  :title="title"
+  :visible.sync="dialogVisible"
+  width="30%"
+  :before-close="handleClose">
+  <div class="maxbox">
+    <div class="center">
+        <el-form ref="form" label-width="40px" label-position='left'>
+            <el-form-item label="超级密码">
+                <el-input v-model="captCha" placeholder="请输入超级密码" style="width:150px"></el-input>
+            </el-form-item>
+        </el-form>
+        <el-button style="height:0.2rem;margin-left:10px" @click="getCode" :class="{'disabled-style':getCodeBtnDisable}" :disabled="getCodeBtnDisable" type="mini" :loading='codeload'>{{codeBtnWord}}</el-button>
+    </div>
+    <div class="bot">
+        <span slot="footer" class="dialog-footer">
+            <el-button size="mini" type="primary" plain @click="handleCloseCancel">取 消</el-button>
+            <el-button size="mini" type="primary" @click="confirms" :loading='confirmLoad'>确 认</el-button>
+        </span>
+    </div>
+  </div>
+</el-dialog>
+</template>
+
+<script>
+import { getStoreId,DynamicLoginNews } from "@/api/storeManage.js";
+export default {
+    props:{
+        storeId:{
+            type:String,
+            default:""
+        },
+        mobilePhone:{
+            type:String,
+            default:''
+        },
+        password:{
+            type:String,
+            default:""
+        }
+    },
+    data () {
+        return {
+            captCha:'',
+            codeload:false,
+            confirmLoad:false,
+            dialogVisible:false,
+            timer:null,
+            codeBtnWord:"获取验证码",
+            waitTime:61 //验证码失效时间
+        }
+    },
+    computed:{
+        title(){
+            return '超级密码'
+        },
+        // 控制获取验证码按钮是否可点击
+        getCodeBtnDisable:{
+            get(){
+                if(this.waitTime == 61){
+                    return false
+                }
+                return true
+            },
+            // 注意：因为计算属性本身没有set方法，不支持在方法中进行修改，而下面我要进行这个操作，所以需要手动添加
+            set(){} 
+        }
+    },
+    methods:{
+        handleCloseCancel(){
+            // Object.assign(this.$data, this.$options.data()) 
+            this.codeBtnWord = '获取验证码'
+            this.getCodeBtnDisable = false
+            this.waitTime = 61
+            clearInterval(this.timer)
+            this.dialogVisible = false
+        },
+        handleClose(done){
+            done()
+            // 清除定时器
+            clearInterval(this.timer)
+            this.codeBtnWord = '获取验证码'
+            this.getCodeBtnDisable = false
+            this.waitTime = 61
+            Object.assign(this.$data, this.$options.data())
+        },
+        confirms(){
+            this.confirmLoad = true
+            let params = {
+                mobilePhone:this.mobilePhone,
+                dynamicPsw:this.captCha,
+                storeId:this.storeId,
+                password:this.password
+            }
+            DynamicLoginNews(params).then(res=>{
+                this.confirmLoad = false
+                if(res.code=='000000'){
+                    this.$message.success({
+                      message: "验证成功",
+                    });
+                    this.$emit('confirm')
+                }else{
+                    this.$alert(res.message, "提示", {
+                      confirmButtonText: "确定",
+                      confirmButtonClass: "confirmbtnFalses",
+                      type: "warning",
+                      center: true,
+                      callback: (action) => {},
+                    });
+                }
+            })
+        },
+        getCode(){
+           this.codeload = true
+           getStoreId({id:this.storeId}).then(res=>{
+            this.codeload = false
+            if(res.code === '000000'){
+              this.$message.success({
+                message: "已发送验证码",
+              });
+              let that = this
+              that.waitTime--
+              that.getCodeBtnDisable = true
+              this.codeBtnWord = `${this.waitTime}s 后重新获取`
+              this.timer = setInterval(function(){
+                  if(that.waitTime>1){
+                      that.waitTime--
+                      that.codeBtnWord = `${that.waitTime}s 后重新获取`
+                  }else{
+                      that.codeBtnWord = '获取验证码'
+                      that.getCodeBtnDisable = false
+                      that.waitTime = 61
+                      clearInterval(that.timer)
+                  }
+              },1000)
+            }
+           })
+        },
+    }
+}
+</script>
+ 
+<style  scoped>
+    .bot{
+        widows: 100%;
+        text-align: right;
+    }
+    .radio{
+        width: 100%;
+        margin-bottom: 15px;
+    }
+    .box{
+        height: 130px;
+        width: 100%;
+        text-align: center;
+    }
+    .center1{
+        display: flex;
+    }
+    .box1{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        text-align: center;
+    }
+    .center{
+        width: 100%;
+        display: flex;
+    }
+    .el-input{
+        flex: 1;
+    }
+    .el-button.disabled-style {
+        background-color: #EEEEEE;
+        color: #CCCCCC;
+    }
+</style>
\ No newline at end of file
diff --git a/src/login/login.vue b/src/login/login.vue
index 606c980..462f5f1 100644
--- a/src/login/login.vue
+++ b/src/login/login.vue
@@ -60,17 +60,15 @@
     </el-card>
     <choice ref="choice" @radioData="radioData"></choice>
     <hiddens ref="hiddens" @hiddensData="hiddensData"></hiddens>
+    <super-password ref="superPassword" @confirm='confirm' :storeId="storeId" :mobilePhone='form.mobilePhone' :password='form.password'/>
   </div>
 </template>
 
 <script>
 import {
-  phoneLogin,
   phonePassLogin,
   getSmsCode,
-  staffls,
   storeLists,
-  getSmsCodesPassword,
   phonePassLoginzd,
   phonePassLoginNew,
   phonePassLoginNews,
@@ -85,8 +83,9 @@ import { setCookie, getCookie, delCookie } from "../utils/utils";
 import { partten } from "../../partten/index";
 import choice from "./components/radio.vue";
 import hiddens from "./components/hiddens.vue";
+import superPassword from "./components/superPassword.vue";
 export default {
-  components: { choice, hiddens },
+  components: { choice, hiddens,superPassword },
   data() {
     return {
       loading: false,
@@ -110,9 +109,13 @@ export default {
       passText: "",
       rowForm: {},
       loginText: "",
+      res:null,
     };
   },
   methods: {
+    confirm(){
+      this.toHome(this.res)
+    },
     openPass() {
       this.$refs.password.focus();
       this.$refs.password.select();
@@ -167,6 +170,7 @@ export default {
       if (partten.phoneNum.test(this.form.mobilePhone)) {
         phonePassLoginNew(this.form).then((res) => {
           if (res.code == "000000") {
+            // this.$refs.superPassword.dialogVisible = true
             if (res.data.storeType == 2) {
               localStorage.setItem("token", res.data.token);
               sessionStorage.setItem("token", res.data.token);
@@ -211,10 +215,16 @@ export default {
               localStorage.setItem("token", res.data.token);
               sessionStorage.setItem("token", res.data.token);
               setCookie("token", res.data.token, 120); //设置
-              this.toHome(res);
-            } else {
-              this.$refs.choice.show(res.data.baseStores);
-            }
+              // this.toHome(res);
+              if(v.dynamicCheckPsw==1){
+                this.$refs.superPassword.dialogVisible = true
+                this.res = res
+              }else{
+                this.toHome(res);
+              }
+              } else {
+                this.$refs.choice.show(res.data.baseStores);
+              }
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
@@ -234,7 +244,13 @@ export default {
               localStorage.setItem("token", res.data.token);
               sessionStorage.setItem("token", res.data.token);
               setCookie("token", res.data.token, 120); //设置
-              this.toHome(res);
+              // this.toHome(res);
+              if(v.dynamicCheckPsw==1){
+                this.$refs.superPassword.dialogVisible = true
+                this.res = res
+              }else{
+                this.toHome(res);
+              }
             } else {
               this.$refs.choice.show(res.data.baseStores);
             }
@@ -255,6 +271,7 @@ export default {
     radioData(v) {
       let form = { ...this.form };
       form.storeId = v.id;
+      this.storeId = v.id
       form.storeName = v.storeName;
       form.storeNum = v.storeNum;
       if (this.showLogin == 0) {
@@ -263,7 +280,13 @@ export default {
             localStorage.setItem("token", res.data.token);
             sessionStorage.setItem("token", res.data.token);
             setCookie("token", res.data.token, 120); //设置
-            this.toHome(res);
+            if(v.dynamicCheckPsw==1){
+              this.$refs.superPassword.dialogVisible = true
+              this.res = res
+              // this.toHome(res);
+            }else{
+              this.toHome(res);
+            }
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
@@ -282,7 +305,13 @@ export default {
             localStorage.setItem("token", res.data.token);
             sessionStorage.setItem("token", res.data.token);
             setCookie("token", res.data.token, 120); //设置
-            this.toHome(res);
+            // this.toHome(res);
+            if(v.dynamicCheckPsw==1){
+              this.$refs.superPassword.dialogVisible = true
+              this.res = res
+            }else{
+              this.toHome(res);
+            }
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
@@ -331,7 +360,6 @@ export default {
       }).then((res) => {
         sessionStorage.setItem("storeInfo", JSON.stringify(res.data));
         if (res.code == "000000") {
-          console.log('存储进去了呀？？？',res.data)
           if (res.data.parentId == null) {
             sessionStorage.setItem("parentId", res.data.id);
             sessionStorage.setItem("parentName", res.data.storeName);
diff --git a/src/pages/branch/map/components/room/room.vue b/src/pages/branch/map/components/room/room.vue
index 5705e59..3d324bc 100644
--- a/src/pages/branch/map/components/room/room.vue
+++ b/src/pages/branch/map/components/room/room.vue
@@ -78,14 +78,12 @@
             <template slot-scope="scope">
               <el-button type="success" size="mini" @click="addRenew(scope.row,scope.$index)">加钟</el-button>
               <el-button type="success" size="mini" @click="openPro(addIndex=scope.$index)">加其他</el-button>
-              </el-switch>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="renew" label="操作" min-width="80">
             <template slot-scope="scope">
               <el-button type="danger" size="mini" @click="del(scope.row,scope.$index)">删除</el-button>
-              </el-switch>
-            </template>
+              </template>
           </el-table-column>
         </el-table>
       </div>
diff --git a/src/pages/eashier/cardToStore/components/edit.vue b/src/pages/eashier/cardToStore/components/edit.vue
index 70c71b6..9cf59b9 100644
--- a/src/pages/eashier/cardToStore/components/edit.vue
+++ b/src/pages/eashier/cardToStore/components/edit.vue
@@ -13,7 +13,7 @@
         </div>
       </el-form-item>
       <el-form-item label="手机号码">
-        <el-input class="form-width-ms" style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" :maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
+        <el-input class="form-width-ms" style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" :maxlength="11" v-model="form.mobilePhone" @change="query">
           <el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button>
         </el-input>
       </el-form-item>
diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue
index 7fc31f7..57feed2 100644
--- a/src/pages/eashier/reatment/reatment.vue
+++ b/src/pages/eashier/reatment/reatment.vue
@@ -4,13 +4,13 @@
       <el-form :model="form" :inline="true" :label-width="formLabelwidth">
         <el-form-item label="手机号码:">
           <div class="form-width-ms flex">
-            <el-input style="padding-left:0px;width:123px;height:100%" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
+            <el-input style="padding-left:0px;min-width:123px;height:100%" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
               <el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button>
             </el-input>
             <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button>
           </div>
         </el-form-item>
-        <el-form-item label="会员名字:">
+        <el-form-item label="会员名字:" label-width="160px">
           <div class="form-width-ms">
             <span>{{ form.memberName }} <i v-if="form.sex==1" class="el-icon-male text-blue"></i>
               <i v-if="form.sex==0" class="el-icon-female text-pink"></i></span>
@@ -30,7 +30,7 @@
           </div>
         </el-form-item>
         <br />
-        <el-form-item label="疗程编码:">
+        <!-- <el-form-item label="疗程编码:">
           <div class="form-width-ms flex ">
             <el-input placeholder="输入疗程编码" v-model="form.projectNum" @blur="proBlur" @change="proBlur">
               <el-button size="mini" slot="append" icon="el-icon-search" @click="openPro"></el-button>
@@ -50,12 +50,8 @@
         <el-form-item label="成交单价:">
           <div class="form-width-ms pointer flex">
             <div >
-              <!-- v-if="!menberShow" @click="(menberShow = true)" -->
               <span class="text-red text-price">{{ form.salesPrice?form.salesPrice:0 }}</span>
-              <!-- <i v-if="form.salesPrice" class="el-icon-edit text-cyan"></i> -->
             </div>
-            <!-- <el-input v-focus class="form-width-sm form-input-wdith-xs" v-else type="number" size="samll" v-model="form.salesPrice" @change="changesales" @blur="changesales" ref="priceinput"></el-input>
-            <span v-if="moneyRatio!=100" class="text-red padding-left-xs text-bold">{{moneyRatio}}%</span> -->
           </div>
         </el-form-item>
         <br />
@@ -84,14 +80,15 @@
           <div class="form-width-xl padding-rigth-xs" style="width:120px">
             <span class="text-cyan text-price">{{ treatAmount }}</span>
           </div>
-        </el-form-item>
-        <el-form-item label="实付金额:">
+        </el-form-item> -->
+         <!-- {{ form.courseReatmentAmount }} -->
+        <!-- <el-form-item label="实付金额:">
           <div class="text-red text-price">
-            <!-- {{ form.courseReatmentAmount }} -->
+           
             {{ paidAmount }}
           </div>
-        </el-form-item><br />
-        <el-form-item label v-show="sessionStorageData.course">
+        </el-form-item><br /> -->
+        <!-- <el-form-item label v-show="sessionStorageData.course">
           <div style="width: 542px;padding-left:28px;">
             <el-checkbox style="display: inline-block" @change="changeIntegralCheckbox" v-model="form.integralCheckbox">
               使用积分| 总积分:{{ form.integral }}
@@ -108,82 +105,176 @@
         <el-input v-show="sessionStorageData.course" style="width: 450px" v-model="form.description" type="textarea" placeholder="请输入说明" maxlength="200" :autosize="{ minRows: 1.5, maxRows: 2 }" show-word-limit></el-input>
         <el-form-item label="说明:" v-show="!sessionStorageData.course">
         </el-form-item>
-        <el-input v-show="!sessionStorageData.course" class="border-radius-10" style="width: 845px" v-model="form.description" type="textarea" placeholder="请输入说明" maxlength="200" :autosize="{ minRows: 1.5, maxRows: 2 }" show-word-limit></el-input>
+        <el-input v-show="!sessionStorageData.course" class="border-radius-10" style="width: 845px" v-model="form.description" type="textarea" placeholder="请输入说明" maxlength="200" :autosize="{ minRows: 1.5, maxRows: 2 }" show-word-limit></el-input> -->
       </el-form>
-      <div class="reat">
-        <div class="margin-bottom-xs">
-          <span class="margin-left padding-left" v-if="sessionStorageData.refillCard">卡付/</span><span>现付</span>
-          <div class="flex justify-start align-start flex-wrap padding-top-xs margin-left padding-left">
-            <div style="width:590px" class="border-radius-10 border margin-right-xs  bg-white padding-xs" v-if="sessionStorageData.refillCard">
-              <el-table :data="rechargeAccountList" :summary-method="getSummaries" show-summary max-height="300">
+      <el-table 
+        :data="list"           
+        :header-cell-style="{
+        background: 'linear-gradient(#6cb3ff, #1873d4)',
+          color: '#eeeeee'
+        }" 
+        max-height="650"
+        stripe
+        ref="list">
+        <el-table-column align="center" prop="projectNum" label="疗程编码" show-overflow-tooltip  min-width="180">
+          <template slot-scope="scope">
+            <div class="form-width-ms flex ">
+              <el-input placeholder="输入疗程编码" v-model="scope.row.projectNum" @blur="proBlur(scope.row.projectNum,scope.$index)" @change="proBlur(scope.row.projectNum,scope.$index)">
+                <el-button size="mini" slot="append" icon="el-icon-search" @click="openPro(scope.$index)"></el-button>
+              </el-input>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip min-width="120" align="center" prop="projectName" label="疗程名称"></el-table-column>
+        <el-table-column align="center" prop="priceMember" label="单次标价" min-width="120">
+          <template slot-scope="scope">
+            <div class="form-width-xs pointer"><span class="text-price text-red">{{scope.row.priceMember?scope.row.priceMember:0}}</span></div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="salesPrice" label="成交单价" min-width="120">
+         <template slot-scope="scope">
+          <div class="form-width-xs pointer"><span class="text-price text-red">{{scope.row.salesPrice?scope.row.salesPrice:0}}</span></div>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" prop="minumumTimes" label="最少购买(次)" min-width="90">
+          <template slot-scope="scope">
+            {{scope.row.minumumTimes?scope.row.minumumTimes:0}}
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" prop="numberTimes" label="购买次数" min-width="120">
+          <template slot-scope="scope">
+            <div class="form-width-xs pointer">
+              <div v-if="!scope.row.buysShow" @click="handleBuysShow(scope.row)">
+                <span class="text-cyan">{{ scope.row.numberTimes?scope.row.numberTimes:0 }}</span>
+                <i v-if="scope.row.numberTimes" class="el-icon-edit text-cyan"></i>
+              </div>
+              <el-input class="form-input-wdith"  v-focus v-else size="samll" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" v-model="scope.row.numberTimes" @change="(val)=>numbertimes(val,scope.$index)" @blur="(val)=>numbertimes(val,scope.$index)"  ref="buyinput"></el-input>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" prop="amount" label="成交金额" min-width="120">
+          <template slot-scope="scope">
+            <div class="form-width-xl" v-if="!scope.row.menberShow" @click="handleMenberShow(scope.row)">
+            <span class="text-price text-red">{{ scope.row.amount?scope.row.amount:0 }}</span>
+            <i v-if="scope.row.amount" class="el-icon-edit text-cyan"></i>
+          </div>
+           <el-input class="form-input-wdith"  v-focus v-else size="samll" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" v-model="scope.row.amount" @change="(val)=>changeDeal(val,scope.$index)" @blur="(val)=>changeDeal(val,scope.$index)" ref="priceinput"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" prop="debtMoney" label="待付金额" min-width="100">
+          <template slot-scope="scope">
+            {{scope.row.debtMoney?scope.row.debtMoney:0}}
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" label="充值卡付" min-width="120" v-if="sessionStorageData.refillCard">
+          <template slot-scope="scope">
+            <el-popover
+              placement="bottom"
+              width="700"
+              @show="openRec(scope.row)"
+              trigger="click">
+              <el-table :data="scope.row.rechargeAccountList" :summary-method="getSummaries" max-height="300" :header-cell-style="{
+                background: 'linear-gradient(#6cb3ff, #1873d4)',
+                  color: '#eeeeee'
+                }" >
                 <el-table-column align="center" prop="rechargeTypeName" label="名称" show-overflow-tooltip min-width="120"></el-table-column>
                 <el-table-column show-overflow-tooltip min-width="70" align="center" prop="cardRestMoney" label="剩余金额"></el-table-column>
                 <el-table-column align="center" prop="cardOver" label="可用金额" width="70"></el-table-column>
-                <!-- <el-table-column align="center" prop="offsetMoney" label="可抵扣额" width="90">
-                  </el-table-column> -->
                 <el-table-column align="center" prop="spendMoney" label="本次支付" width="90">
-                  <template slot-scope="scope">
-                    <div v-if="!scope.row.isShow" @click="openCard(scope.row, scope.$index)" class="form-input-width">
-                      {{ scope.row.spendMoney }}
+                  <template slot-scope="scopes">
+                    <div v-if="!scopes.row.isShow" @click="openCard(scopes.row, scope.$index)" class="form-input-width">
+                      {{ scopes.row.spendMoney }}
                       <i class="el-icon-edit text-cyan"></i>
                     </div>
                     <el-input v-focus οninput="value=value.replace(/^0[0-9]+/,val=>val[1]).replace(/^(\.)+/,'').replace(/[^\d.]/g,'').replace(/\.+/,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                      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>
+                      class="form-input-width-xs" @change="endEditCard(scopes.row,scope.$index)" @blur="endEditCard(scopes.row,scope.$index)" v-else v-model.lazy="scopes.row.spendMoney" precision="2"></el-input>
                   </template>
                 </el-table-column>
-                <!-- <el-table-column align="center" prop="discoutMoney" label="抵扣支付" width="90">
-                    <template slot-scope="scope">
-											<div v-show="!scope.row.isShows" @click="disedit(scope.row,scope.$index)"
-												style="padding:0 0px;cursor: pointer;width:80px">
-												{{scope.row.discoutMoney}}
-											</div>
-											<input :ref="'indexs'+scope.$index"
-												onkeyup="value = value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-												@blur="endEditCards(scope.row)" @keydown.enter="endEditCards(scope.row)"
-												@change="endEditCards(scope.row)" v-show="scope.row.isShows"
-												v-model="scope.row.discoutMoney" type="text"
-												style="height:28px;width:60px" />
-										</template>
-                  </el-table-column> -->
                 <el-table-column align="center" prop="cardOvers" label="可用余额" width="70"></el-table-column>
                 <el-table-column show-overflow-tooltip align="center" prop="storeName" label="所属门店" width="120"></el-table-column>
               </el-table>
-              <div class="jisuan" v-show="false">
-                <span>小计 :</span>
-                <span style="padding-left: 60px">¥{{ form.collectionRechargeAmount }}</span>
-                <span v-show="false">{{ collectionRechargeAmounts }}</span>
-              </div>
-            </div>
-            <div style="width:280px" class="border-radius-10 border margin-right-xs  bg-white padding-xs">
-              <el-table :data="payLists" :summary-method="getSummaries" show-summary row-key="payId">
-                <el-table-column align="center" prop="collectionTypeName" label="支付方式" min-width="100"></el-table-column>
-                <el-table-column align="center" prop="payMoney" fixed="right" label="本次支付 ( ¥ )" width="120">
-                  <template slot-scope="scope">
-                    <div class="form-input-width" v-if="!scope.row.isShow" @click="openpay(scope.row, scope.$index)">{{ scope.row.payMoney }}<i class="el-icon-edit text-cyan"></i></div>
-                    <el-input v-focus type="number" class="form-input-width-xs" @change="endEdit(scope.row)" @blur="endEdit(scope.row)" v-else v-model.lazy="scope.row.payMoney" precision="2"></el-input>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <div class="jisuan" v-show="false">
-                <span>小计 :</span>
-                <span style="padding-left: 60px">¥{{ form.collectionCashAmount }}</span>
-              </div>
-            </div>
+              <el-button slot="reference">充值卡</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" label="卡付金额" min-width="100">
+          <template slot-scope="scope">
+            {{ selectTabAmount(scope.row.rechargeAccountList,2)?selectTabAmount(scope.row.rechargeAccountList,2):0 }}
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" label="现付金额" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.nowAmount.toFixed(2)*1 }}
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" label="欠款金额" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.debtAmount.toFixed(2)*1 }}
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" label="实付金额" min-width="100">
+          <template slot-scope="scope">
+            {{ selectTabAmount(scope.row.rechargeAccountList,2) + scope.row.nowAmount.toFixed(2)*1 }}
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" prop="storeName" label="说明" min-width="250">
+          <template slot-scope="scope">
+            <el-input style="width: 180px" v-model="scope.row.description" placeholder="请输入说明"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" label="操作" min-width="120">
+            <template slot-scope="scope">
+              <el-button type="danger" size="mini" @click="handleDel(scope.$index)">删除</el-button>
+            </template>
+        </el-table-column>
+      </el-table>
+      <div class="reat" style="display:flex;margin-top:20px;align-content:space-between">
+        <div class="margin-bottom-xs marginAuto">
+          <span  style="flex:1">员工/门店管理层/高管业绩</span>
+          <div style="display: flex">
+            <staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>
+            <admin ref="admin" @adminData="adminData"></admin>
+            <manager ref="manager" @managerData="managerData"></manager>
           </div>
         </div>
-        <span class="margin-left padding-left ">员工/门店管理层/高管业绩</span>
-        <div class="flex justify-start align-start flex-wrap padding-top-xs margin-left padding-left">
-          <staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>
-          <admin ref="admin" @adminData="adminData"></admin>
-          <manager ref="manager" @managerData="managerData"></manager>
+        <div class="tab">
+          <el-table :data="payLists" :summary-method="getSummaries" show-summary row-key="payId" :header-cell-style="{
+            background: 'linear-gradient(#6cb3ff, #1873d4)',
+              color: '#eeeeee'
+            }" >
+            <el-table-column align="center" prop="collectionTypeName" label="支付方式" min-width="100"></el-table-column>
+              <el-table-column align="center" prop="payMoney" fixed="right" label="本次支付 ( ¥ )" width="120">
+                <template slot-scope="scope">
+                  <div class="form-input-width" v-if="!scope.row.isShow" @click="openpay(scope.row)">{{ scope.row.payMoney }}<i class="el-icon-edit text-cyan"></i></div>
+                  <el-input v-focus type="number" class="form-input-width-xs" @change="endEdit(scope.row)" @blur="endEdit(scope.row)" v-else v-model.lazy="scope.row.payMoney" precision="2"></el-input>
+                </template>
+              </el-table-column>
+          </el-table>     
         </div>
-      </div>
-      <div class="text-center padding-top" style="width:940px">
-        <el-button size="mini" type="info" plain @click="empty">清空</el-button>
-        <el-button size="mini" v-if="isAddition==0" type="primary" @click="isAddition = 1" v-role="5003002">补单</el-button>
-        <el-button size="mini" v-else type="success" @click="isAddition = 0">疗程</el-button>
-        <el-button size="mini" type="primary" plain @click="getList" v-role="5004001">列表</el-button>
-        <el-button size="mini" type="primary" @click="save((saveloading = true))" :loading="saveloading" v-role="5004002">提交</el-button>
+        <div style="width:100px">
+            <el-button size="mini" type="primary"  :loading="saveloading" style="width:100%;height:35px;margin:10px 10px" @click="addList">添加</el-button>
+            <el-button size="mini" type="info" plain @click="empty" style="width:100%;height:35px;margin:10px 10px">清空</el-button>
+            <el-button size="mini" v-if="isAddition==0" type="primary" @click="isAddition = 1" v-role="5003002" style="width:100%;height:35px;;margin:10px 10px">补单</el-button> 
+            <el-button size="mini" v-else type="success" @click="isAddition = 0" style="width:100%;height:35px;;margin:10px 10px">疗程</el-button>
+            <el-button size="mini" type="primary" plain @click="getList" v-role="5004001" style="width:100%;height:35px;;margin:10px 10px">列表</el-button>
+            <el-button size="mini" type="primary" @click="save((saveloading = true))" :loading="saveloading" v-role="5004002" style="width:100%;height:35px;;margin:10px 10px">提交</el-button>
+          </div>
+          <div class="right">
+            <el-form ref="form" label-width="65px">
+                <el-form-item label="成交额:">
+                  <span class="text-price text-red">{{ amountType(1) }}</span>
+                </el-form-item>
+                <el-form-item label="卡付:">
+                  <span class="text-price text-red">{{ amountType(2) }}</span>
+                </el-form-item>
+                <el-form-item label="现付:">
+                  <span class="text-price text-red">{{ amountType(3) }}</span>
+                </el-form-item>
+                <el-form-item label="欠款:">
+                  <span class="text-price text-red">{{ amountType(4) }}</span>
+                </el-form-item>
+            </el-form>
+          </div>  
       </div>
       <div class="reatmen">
         <!-- 保存列表弹窗 -->
@@ -236,11 +327,6 @@
             <el-table-column align="center" prop="debtMoney" label="欠款" min-width="70"></el-table-column>
             <el-table-column align="center" prop="storeName" label="所属门店" show-overflow-tooltip min-width="100"></el-table-column>
             <el-table-column align="center" prop="inputBy" label="录单人" min-width="70"></el-table-column>
-            <!--<el-table-column align="center" fixed="right" label="账户操作" width="100" v-if="sessionStorageData.allowValid == 1">
-              <template slot-scope="scope">
-                <el-button @click.stop="openPostpone(scope.row, (postponeDialog = true))" :disabled="scope.row.isCancel === 1" size="mini" type="success">账户延期</el-button>
-              </template>
-            </el-table-column> -->
             <el-table-column align="center" fixed="right" label="明细" width="76">
               <template slot-scope="scope">
                 <el-button size="mini" type="primary" @click="detail(scope.row)" plain>明细</el-button>
@@ -347,12 +433,8 @@
                   <el-table-column align="center" prop="payMoney" label="支付" width="80"></el-table-column>
                 </el-table>
                 <br />
-                <!-- <el-form-item label="实付金额:">
-                  <div>{{ printForm.collectionAmount }}</div>
-                </el-form-item> -->
                 <div style="height:50px"></div>
                 <el-form-item label="签名:">
-                  <!-- <div style="height:30px;width:150px;border-bottom:1px solid #333"> </div> -->
                 </el-form-item><br />
                 <el-form-item label="服务热线:">
                   {{ printForm.telephone }} </el-form-item><br />
@@ -432,46 +514,9 @@ export default {
   },
   data() {
     return {
-      list:[ {
-        name: "66矿石",
-        img:
-          "https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/32ed6a7619934144882d841761b63d3c~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
-      },
-      {
-        name: "随机限量徽章",
-        img:
-          "https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/71c68de6368548bd9bd6c8888542f911~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
-      },
-      {
-        name: "掘金新款T恤",
-        img:
-          "https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/5bf91038a6384fc3927dee294a38006b~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
-      },
-      {
-        name: "Bug",
-        img:
-          "https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/0a4ce25d48b8405cbf5444b6195928d4~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
-      },
-      {
-        name: "乐高海洋巨轮",
-        img:
-          "https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/aabe49b0d5c741fa8d92ff94cd17cb90~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
-      },
-      {
-        name: "掘金马克杯",
-        img:
-          "https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/ab31c183950541d4a0731c0b8765b173~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
-      },
-      {
-        name: "Yoyo抱枕",
-        img:
-          "https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/33f4d465a6a9462f9b1b19b3104c8f91~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
-      },
-      {
-        name: "Switch",
-        img:
-          "https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/4decbd721b2b48098a1ecf879cfca677~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
-      },],
+      isShow:false,
+      list:[],
+      selectIndex:0,
       input: null,
       printDialogVisible: false, //打印弹窗开关
       listDialogVisible: false,
@@ -513,7 +558,6 @@ export default {
       openCollNumber: 0,
       radioEditStaff: "",
       editStaffTable: [],
-
       sessionStorageData: {}, //门店参数集合
       editStaffRatioRow: "",
       radioEditStaffList: {},
@@ -592,6 +636,20 @@ export default {
     };
   },
   computed:{
+    amountType(){
+      return function(type){
+        // 1成交额 2卡付 3现付 4欠款
+        let num =  type==1?eval(this.list.map(item=>{return item.amount?item.amount*1:0}).join("+")):(type==2?eval(this.list.map(item=>{return this.selectTabAmount(item.rechargeAccountList,2)?this.selectTabAmount(item.rechargeAccountList,2):0}).join("+")):(type==3?eval(this.payLists.map(item=>{return item.payMoney*1}).join("+")):eval(this.list.map(item=>{return item.debtAmount?item.debtAmount*1:0}).join("+"))))
+        return num?num.toFixed(2)*1:0
+      }
+    },
+    // 现付金额
+    selectTabAmount(){
+      return function(val,type){
+        let num = type ==1? eval(val.map(item=>{return item.payMoney?item.payMoney*1:0}).join("+")):eval(val.map(item=>{return item.spendMoney?item.spendMoney*1:0}).join("+"))
+        return num?num.toFixed(2)*1:0
+      }
+    },
     // 待付金额
     treatAmount(){
       // 需要转换类型(字符串拼接需要转数值)
@@ -655,28 +713,134 @@ export default {
     }
   },
   methods: {
+    handleMenberShow(row){
+      // let num = eval(this.payLists.map(item=>{return item.payMoney*1}).join("+")) 
+      // let cardNum = this.selectTabAmount(row.rechargeAccountList,2)
+      // if(num ||cardNum){
+      //   this.$message.error({
+      //       message: "当前项目存在卡付或者现付！请先清空再进行操作",
+      //     });
+      // }else{
+        row.menberShow = true
+      // }
+    },
+    handleBuysShow(row){
+      // let num = eval(this.payLists.map(item=>{return item.payMoney*1}).join("+")) 
+      // let cardNum = this.selectTabAmount(row.rechargeAccountList,2)
+      // if(num ||cardNum){
+      //   this.$message.error({
+      //       message: "当前项目存在卡付或者现付！请先清空再进行操作",
+      //     });
+      // }else{
+        row.buysShow = true
+      // }
+    },
+    updataNowAmount(){
+      // 重置list
+      this.list.forEach(item=>{
+        // 清空现付,重置待付,欠款
+        item.nowAmount = 0
+        item.debtMoney = item.amount - this.selectTabAmount(item.rechargeAccountList,2)
+        let cardCashSum = item.nowAmount*1 + (this.selectTabAmount(item.rechargeAccountList,2)?this.selectTabAmount(item.rechargeAccountList,2):0)
+        item.debtAmount = ((item.amount * this.sessionStorageData.debtRatio * 1) /100 ).toFixed(2) *1 
+        if(cardCashSum>item.debtAmount){
+          item.debtAmount = 0
+        }else{
+          item.debtAmount -= cardCashSum.toFixed(2)*1
+        }
+      })
+      let num = eval(this.payLists.map(item=>{return item.payMoney*1}).join("+")) //现金总和
+      this.list.forEach(item=>{
+        if(item.debtMoney){ //待付金额存在
+          if(num){
+            if(num>item.debtMoney){ //够付,不存在欠款
+              item.nowAmount = item.debtMoney
+              num -= item.nowAmount*1
+              item.debtMoney = 0
+              item.debtAmount = 0
+            }else{ //不够付
+              item.nowAmount = num
+              item.debtMoney = (item.debtMoney-num).toFixed(2)*1
+              num = 0
+              item.debtAmount = ((item.amount * this.sessionStorageData.debtRatio * 1) /100 ).toFixed(2) *1 
+              let cardCashSum = (item.nowAmount*1 + (this.selectTabAmount(item.rechargeAccountList,2)?this.selectTabAmount(item.rechargeAccountList,2):0))
+              if(cardCashSum>item.debtAmount){
+                item.debtAmount = 0
+              }else{
+                item.debtAmount -= cardCashSum
+              }
+            }
+          }
+        }
+      })
+    },
+    openRec(row){
+      row = this.handleData(row)
+    },
+    handleData(row){
+        if(row){
+            row.rechargeAccountList.forEach(firstItem=>{
+                let list = []
+                this.list.forEach(secondItem=>{
+                    secondItem.rechargeAccountList.forEach(thirdItem=>{
+                        if(thirdItem.id === firstItem.id){
+                            thirdItem.spendMoney = thirdItem.spendMoney?thirdItem.spendMoney*1:0
+                            list.push(thirdItem)
+                        }
+                    })
+                })
+                // // 本单使用总和
+                this.$set(firstItem,'cardSum',eval(list.map(item=>item.spendMoney*1).join("+")))
+                this.$set(firstItem,'cardOvers',firstItem.cardOver-firstItem.cardSum)
+                firstItem.cardOvers = (firstItem.cardOvers).toFixed(2)*1
+                // // 可用余额
+            })
+        }
+        return row
+    },
+    handleDel(index){
+      this.list.splice(index,1)
+      this.resetAmount()
+      this.updataNowAmount()
+    },
+    addList(){
+      this.list.push({
+        rechargeAccountList:JSON.parse(JSON.stringify(this.rechargeAccountList)),
+        payLists:JSON.parse(JSON.stringify(this.payLists)),
+        menberShow:false,
+        buysShow:false,
+        numberTimes:0,
+        amount:0,
+        integralCheckbox:false,
+        debtAmount:0,
+        nowAmount:0
+        })
+    },
     routePush(){
       this.$refs.trading.dialogFormVisible = true
     },
-    changeDeal(val){
-      if(typeof(val)=='object')return this.menberShow = false
-      this.form.numberTimes?this.form.numberTimes*1:0 //购买次数转化
-      this.form.amount = val*1
-      if((val>(this.form.numberTimes*this.form.topPriceMember))||(val<(this.form.minumumPriceMember*this.form.numberTimes))){ //金额大于最大支付或者小于最大支付
+    changeDeal(val,index){
+      if(typeof(val)=='object')return this.list[index].menberShow = false
+      this.list[index].numberTimes?this.list[index].numberTimes*1:0 //购买次数转化
+      this.list[index].amount = val*1
+      if((val>(this.list[index].numberTimes*this.list[index].topPriceMember))||(val<(this.list[index].minumumPriceMember*this.list[index].numberTimes))){ //金额大于最大支付或者小于最大支付
         this.$message.warning({
           message:
             "成交金额不能低于" +
-            this.form.minumumPriceMember*this.form.numberTimes +
+            this.list[index].minumumPriceMember*this.list[index].numberTimes +
             "高于" +
-          this.form.numberTimes*this.form.topPriceMember,
+          this.list[index].numberTimes*this.list[index].topPriceMember,
         });
-        this.form.amount = (this.form.salesPrice*this.form.numberTimes).toFixed(2)*1
-        this.form.salesPrice = (this.form.amount/this.form.numberTimes).toFixed(2)*1
+        this.list[index].amount = (this.list[index].salesPrice*this.list[index].numberTimes).toFixed(2)*1
+        this.list[index].salesPrice = (this.list[index].amount/this.list[index].numberTimes).toFixed(2)*1
       }else{
-        this.form.salesPrice = (this.form.amount/this.form.numberTimes).toFixed(2)*1
-        // this.form.amount = (this.form.salesPrice*this.form.numberTimes).toFixed(2)*1
+        this.list[index].salesPrice = (this.list[index].amount/this.list[index].numberTimes).toFixed(2)*1
+        this.list[index].rechargeAccountList = JSON.parse(JSON.stringify(this.rechargeAccountList))
+        this.resetAmount()
+        this.list[index].debtMoney = (val - (this.selectTabAmount(this.list[index].rechargeAccountList,2) + this.selectTabAmount(this.list[index].payLists,1) )).toFixed(2)*1
+        this.updataNowAmount()
       }
-      this.menberShow = false
+      this.list[index].menberShow = false
     },
     close() {
       this.listDialogVisible = false;
@@ -873,7 +1037,7 @@ export default {
       var show = true;
       if (this.editStaffDailogtitle == "修改") {
         this.detailForm.entities.forEach((item) => {
-          console.log(this.radioEditStaffList);
+          // console.log(this.radioEditStaffList);
           if (item.saleStaffId == this.radioEditStaffList.id) {
             this.$message.warning({
               message: "员工已存在",
@@ -924,7 +1088,6 @@ export default {
           this.form.mobilePhone = mobilePhone;
           if (res.code == "000000") {
             this.vip = res.data;
-            console.log(this.vip);
             this.form.memberName = res.data.memberName;
             this.form.minumumTimes = res.data.minumumTimes;
             this.debtMoneys = res.data.debtMoney;
@@ -970,6 +1133,7 @@ export default {
                   rechargeAccountList.push(item);
                 });
                 this.rechargeAccountList = rechargeAccountList;
+                this.addList()
               } else {
                 this.$alert("查询会员充值卡: " + res.message, "提示", {
                   confirmButtonText: "确定",
@@ -1046,37 +1210,32 @@ export default {
       })
     },
     //修改购买次数
-    numbertimes() {
-      if (this.form.numberTimes < this.proForm.minumumTimes) {
+    numbertimes(val,index) {
+      // debtMoney
+      if (this.list[index].numberTimes < this.list[index].minumumTimes) {
         this.$message.info({
-          message: "最低购买不能少于" + this.proForm.minumumTimes + "次",
+          message: "最低购买不能少于" + this.list[index].minumumTimes + "次",
         });
-        this.form.numberTimes = this.proForm.minumumTimes;
-        this.buysShow = false;
+        this.list[index].numberTimes = this.list[index].minumumTimes;
+        this.list[index].buysShow = false;
       } else {
-        this.buysShow = false;
-        // this.form.salesPrice = (this.form.amount*1/this.form.numberTimes).toFixed(2)*1
-        this.form.amount = (this.form.numberTimes*this.form.salesPrice).toFixed(2)*1
-        this.form.debtMoney = this.form.amount;
+        this.list[index].buysShow = false;
+        this.list[index].rechargeAccountList = JSON.parse(JSON.stringify(this.rechargeAccountList))
         this.resetAmount()
+        this.list[index].amount = (this.list[index].numberTimes*this.list[index].salesPrice).toFixed(2)*1
+        this.list[index].debtMoney = (this.list[index].amount*1 -(this.selectTabAmount(this.list[index].rechargeAccountList,2) + this.selectTabAmount(this.list[index].payLists,1))).toFixed(2)*1;
+        this.updataNowAmount()
       }
     },
     //选择金额.
-    openpay(row, $index) {
-      if (this.form.projectName) {
-        if (row.payMoney) {
-          row.payMoney = row.payMoney * 1;
-        } else {
-          row.payMoney = 0;
-        }
-        // row.payMoney = (this.form.debtMoney + row.payMoney).toFixed(2) * 1
-        row.payMoney = this.treatAmount
-        if (!row.payMoney) {
-          row.payMoney = 0;
-        }
-        // 多加层判断，现金不可能付负数,如果是负数清0
-        if(row.payMoney<=0){
+    openpay(row) {
+      if (this.form.memberName&&this.list.length) {
+        if(row.payMoney*1){
           row.payMoney = 0
+          this.updataNowAmount()
+        }else{
+          let num = eval(this.list.map(item=>item.debtMoney?item.debtMoney*1:0).join("+")) //待付金额总和
+          row.payMoney = num.toFixed(2)*1
         }
         row.isShow = true;
       } else {
@@ -1085,32 +1244,43 @@ export default {
         });
       }
     },
-    endEdit(row) {
-      if (row.payMoney) {
-        row.payMoney = (row.payMoney * 1).toFixed(2) * 1;
-      } else {
-        row.payMoney = 0;
+    updataDebtAmount(index){
+      let num = ( this.selectTabAmount(this.list[index].rechargeAccountList,2) + this.list[index].nowAmount*1 ) //实付金额
+      let maxdebt= ((this.list[index].amount * this.sessionStorageData.debtRatio * 1) /100 ).toFixed(2) *1 //最大欠款
+      if(num>maxdebt){ //不存在欠款
+        this.list[index].debtAmount = 0
+      }else{ //还需最少支付
+        this.list[index].debtAmount = (maxdebt - num).toFixed(2)*1
       }
-      // 多加层判断，现金不可能付负数,如果是负数清0！！！
-      if(row.payMoney<=0){
-         row.payMoney = 0;
+    },
+    endEdit(row) {
+      row.payMoney = row.payMoney*1
+      // let cashNum = eval(this.payLists.map(item=>{return item.payMoney*1}).join("+")) //现金总和
+      let cardNum = eval(this.list.map(item=>{return item.debtMoney*1}).join("+")) //待付总和
+      if(row.payMoney>cardNum){
+        this.$message.info({
+          message: "超出需支付金额 !请重新选择",
+        });
+        row.payMoney = 0
+      }else{
+        this.updataNowAmount(row)
       }
       row.isShow = false;
-      this.num();
     },
 
     //返回当前行的下标
     tableRowClassName({ row, rowIndex }) {
       row.index = rowIndex;
     },
-    proBlur() {
+    proBlur(projectNum,index) {
       this.form.projectNum;
       let form = {
         pageSize: 999,
-        projectNum: this.form.projectNum,
+        projectNum,
         state: 1,
         directConsumption: 0,
       };
+      this.selectIndex = index
       propage(form).then((res) => {
         if (res.code == "000000") {
           if (res.pageInfo.total == 1) {
@@ -1129,46 +1299,47 @@ export default {
         }
       });
     },
-    proChange(v) {
-      console.log(v);
-      this.pageInfos.reatmentList.forEach((item) => {
-        if (item.id == v) {
-          this.proForm = item;
-        }
-      });
-      this.proConfirm(this.proForm);
-    },
+    // proChange(v) {
+    //   console.log(v);
+    //   this.pageInfos.reatmentList.forEach((item) => {
+    //     if (item.id == v) {
+    //       this.proForm = item;
+    //     }
+    //   });
+    //   this.proConfirm(this.proForm);
+    // },
     //打开选择会员充值卡包弹窗
-    openPro() {
+    openPro(index) {
+      this.selectIndex = index
       this.$refs.project.show(0);
     },
     //购买类型确定
     proConfirm(pros) {
-      console.log(pros)
       this.proForm = pros;
       if (this.form.memberId) {
-        this.form.projectName = this.proForm.projectName;
-        this.form.projectNum = this.proForm.projectNum;
-        this.form.projctId = this.proForm.id;
-        this.form.price = this.proForm.price;
-        this.form.topPrice = this.proForm.topPrice;
-        this.form.topPriceMember = this.proForm.topPriceMember;
-        this.form.priceMember = this.proForm.priceMember;
-        this.form.minumumPriceMember = this.proForm.minumumPriceMember;
-        this.form.salesPrice = this.proForm.priceMember;
-        this.form.minumumPrice = this.proForm.minumumPrice;
-        this.form.salesAchievement = this.proForm.salesAchievement;
-        this.form.salesCommission = this.proForm.salesCommission;
-        this.form.cardSalesAchievement = this.proForm.cardSalesAchievement;
-        this.form.cardSalesCommission = this.proForm.cardSalesCommission;
-        this.form.minumumTimes = this.proForm.minumumTimes;
-        this.form.numberTimes = this.proForm.minumumTimes;
-        this.form.amount =
-          ((this.form.salesPrice * 100 * this.form.numberTimes) / 100).toFixed(
+        this.list[this.selectIndex].projectName = this.proForm.projectName;
+        this.list[this.selectIndex].projectNum = this.proForm.projectNum;
+        this.list[this.selectIndex].projctId = this.proForm.id;
+        this.list[this.selectIndex].price = this.proForm.price;
+        this.list[this.selectIndex].topPrice = this.proForm.topPrice;  
+        this.list[this.selectIndex].topPriceMember = this.proForm.topPriceMember;
+        this.list[this.selectIndex].priceMember = this.proForm.priceMember;
+        this.list[this.selectIndex].minumumPriceMember = this.proForm.minumumPriceMember;
+        this.list[this.selectIndex].salesPrice = this.proForm.priceMember;
+        this.list[this.selectIndex].minumumPrice = this.proForm.minumumPrice;
+        this.list[this.selectIndex].salesAchievement = this.proForm.salesAchievement;
+        this.list[this.selectIndex].salesCommission = this.proForm.salesCommission;
+        this.list[this.selectIndex].cardSalesAchievement = this.proForm.cardSalesAchievement;
+        this.list[this.selectIndex].cardSalesCommission = this.proForm.cardSalesCommission;
+        this.list[this.selectIndex].minumumTimes = this.proForm.minumumTimes;
+        this.list[this.selectIndex].numberTimes = this.proForm.minumumTimes;
+        this.list[this.selectIndex].amount =
+          ((this.list[this.selectIndex].salesPrice * 100 * this.list[this.selectIndex].numberTimes) / 100).toFixed(
             2
           ) * 1;
-        this.form.debtMoney = this.form.amount;
-        if (this.form.integralCheckbox == true) {
+        this.list[this.selectIndex].debtMoney = this.list[this.selectIndex].amount;
+        this.list[this.selectIndex].debtAmount= (this.list[this.selectIndex].amount * this.sessionStorageData.debtRatio * 1/100).toFixed(2)*1;
+        if (this.list[this.selectIndex].integralCheckbox == true) {
           if (
             JSON.parse(sessionStorage.getItem("sessionStorageData"))
               .excIntegralByMoney
@@ -1177,75 +1348,83 @@ export default {
               sessionStorage.getItem("sessionStorageData")
             ).excIntegralByMoney.split(":");
           }
-          if (this.form.integralMoney >= this.form.debtMoney) {
-            this.form.integralMoney = this.form.debtMoney;
-            this.form.consumeIntegral =
-              this.form.debtMoney * (list[0] / list[1]);
-            this.form.debtMoney = 0;
+          if (this.list[this.selectIndex].integralMoney >= this.list[this.selectIndex].debtMoney) {
+            this.list[this.selectIndex].integralMoney = this.list[this.selectIndex].debtMoney;
+            this.list[this.selectIndex].consumeIntegral =
+              this.list[this.selectIndex].debtMoney * (list[0] / list[1]);
+            this.list[this.selectIndex].debtMoney = 0;
           } else {
-            this.form.debtMoney = this.form.amount - this.form.integralMoney;
+            this.list[this.selectIndex].debtMoney = this.list[this.selectIndex].amount - this.list[this.selectIndex].integralMoney;
           }
-          this.form.collectionIntegralAmount = this.form.integralMoney;
+          this.list[this.selectIndex].collectionIntegralAmount = this.list[this.selectIndex].integralMoney;
         } else {
-          this.form.debtMoney = this.form.amount;
-          this.form.collectionIntegralAmount = 0;
+          this.list[this.selectIndex].debtMoney = this.list[this.selectIndex].amount;
+          this.list[this.selectIndex].collectionIntegralAmount = 0;
         }
-        this.form.collectionCashAmount = 0;
-        this.form.collectionRechargeAmount = 0;
-        this.form.courseReatmentAmount =
-          this.form.collectionCashAmount +
+        this.list[this.selectIndex].collectionCashAmount = 0;
+        this.list[this.selectIndex].collectionRechargeAmount = 0;
+        this.list[this.selectIndex].courseReatmentAmount =
+          this.list[this.selectIndex].collectionCashAmount +
           this.collectionRechargeAmounts +
-          this.form.collectionIntegralAmount;
+          this.list[this.selectIndex].collectionIntegralAmount;
+
+        this.list.push({})
+        this.list.pop()
       }
     },
     openCard(row, $index) {
+      if (this.list[$index].salesPrice != "") {
+          row.isShow = true;
+      } else {
+        return this.$message.info({
+          message: "请先选择疗程!",
+        });
+      }
+      if(row.spendMoney*1!=0){
+        row.cardOvers = (row.spendMoney*1+row.cardOvers).toFixed(0)*1
+      }
       if (this.sessionStorageData.buycourse == true) {
-        if (this.form.debtMoney * 1 > 0) {
+        if (this.list[$index].debtMoney * 1 > 0) {
           if (
-            row.cardOver >=
+            row.cardOvers >=
             ((row.discoutMoney * row.discount) / 100).toFixed(2) * 1
           ) {
-            row.discoutMoney = this.form.debtMoney * 1;
+            row.discoutMoney = this.list[$index].debtMoney * 1;
             row.spendMoney =
               ((row.discoutMoney * row.discount) / 100).toFixed(2) * 1;
           } else {
             row.discoutMoney =
-              (row.cardOver / (row.discount / 100).toFixed(2)) * 1;
-            row.spendMoney = row.cardOver;
+              (row.cardOvers / (row.discount / 100).toFixed(2)) * 1;
+            row.spendMoney = row.cardOvers;
           }
         } else {
           row.spendMoney = 0;
         }
       } else {
-        if (this.form.debtMoney * 1 > 0) {
-          if (row.cardOver < this.form.debtMoney * 1) {
-            row.spendMoney = row.cardOver;
-            row.discoutMoney = row.cardOver;
+        if (this.list[$index].debtMoney * 1 > 0) {
+          if (row.cardOvers < this.list[$index].debtMoney * 1) {
+            row.spendMoney = row.cardOvers;
+            row.discoutMoney = row.cardOvers;
           } else {
-            row.discoutMoney = this.form.debtMoney * 1;
-            row.spendMoney = this.form.debtMoney * 1;
+            row.discoutMoney = this.list[$index].debtMoney * 1;
+            row.spendMoney = this.list[$index].debtMoney * 1;
           }
         } else {
           row.spendMoney = 0;
         }
       }
-      if (this.form.salesPrice != "") {
-        row.isShow = true;
-      } else {
-        this.$message.info({
-          message: "请先选择疗程!",
-        });
-      }
     },
-    endEditCard(row) {
+    endEditCard(row,index) {
       row.spendMoney = (row.spendMoney * 1).toFixed(2) * 1;
       if (row.spendMoney == "") {
         row.spendMoney = 0;
       }
-      if (row.spendMoney * 1 > row.cardOver * 1) {
+      if (row.spendMoney * 1 > row.cardOvers * 1) {
         this.$message.info({
           message: "支付金额不能大于可用金额!",
         });
+        row.spendMoney = 0;
+        row.isShow = false;
       } else {
         row.isShow = false;
         if (this.sessionStorageData.buycourse == true) {
@@ -1253,25 +1432,27 @@ export default {
             row.discoutMoney =
               (row.spendMoney / (row.discount / 100)).toFixed(2) * 1;
             row.cardOvers =
-              (row.cardOver * 1 - row.spendMoney * 1).toFixed(2) * 1;
+              (row.cardOvers * 1 - row.spendMoney * 1).toFixed(2) * 1;
           } else {
             row.discoutMoney = 0;
             row.cardOvers =
-              (row.cardOver * 1 - row.spendMoney * 1).toFixed(2) * 1;
+              (row.cardOvers * 1 - row.spendMoney * 1).toFixed(2) * 1;
           }
         } else {
+          // console.log('会到这里----》',row.spendMoney)
           if (row.spendMoney * 1 > 0) {
             row.discoutMoney = row.spendMoney.toFixed(2) * 1;
             row.cardOvers =
-              (row.cardOver * 1 - row.spendMoney * 1).toFixed(2) * 1;
+              (row.cardOvers * 1 - row.spendMoney * 1).toFixed(2) * 1;
           } else {
             row.discoutMoney = 0;
             row.cardOvers =
-              (row.cardOver * 1 - row.spendMoney * 1).toFixed(2) * 1;
+              (row.cardOvers * 1 - row.spendMoney * 1).toFixed(2) * 1;
           }
         }
       }
-      this.cardnum();
+      this.cardnum(index);
+      this.updataDebtAmount(index)
     },
     disedit(row, $index) {
       if (this.form.salesPrice != "") {
@@ -1287,7 +1468,6 @@ export default {
       }
     },
     endEditCards(row) {
-      //console.log(row);
       if (row.discoutMoney == "") {
         row.discoutMoney = 0;
       }
@@ -1321,10 +1501,10 @@ export default {
     //保存确定方法
     save() {
       // this.payLists
-      this.form.courseReatmentAmount = parseInt(this.paidAmount)
-      this.form.debtMoney = parseInt(this.treatAmount)
+      // this.form.courseReatmentAmount = parseInt(this.paidAmount)
+      // this.form.debtMoney = parseInt(this.treatAmount)
       // ----
-      this.form.isAddition = this.isAddition;
+      // this.form.isAddition = this.isAddition;
       var staffLists = [];
       this.staffLists.forEach((item) => {
         delete item.ratioShow;
@@ -1332,41 +1512,32 @@ export default {
           staffLists.push(item);
         }
       });
-      var payLists = [];
-      var rechargeAccountList = [];
-      // 用作删除数组
-      const auxiliaryArr = ['isShow','state','collectionType','id','collectionTypeName']
-      for (let i =0;i<this.payLists.length;i++) {
-        let params = {...this.payLists[i]}
-        params.payId = this.payLists[i].id;
-        params.payName = this.payLists[i].collectionTypeName;
-        auxiliaryArr.forEach(item=>{
-          delete params[item]
-        })
-        // this.payLists[i].payId = this.payLists[i].id;
-        // this.payLists[i].payName = this.payLists[i].collectionTypeName;
-        // delete this.payLists[i].isShow;
-        // delete this.payLists[i].state;
-        // delete this.payLists[i].collectionType;
-        // delete this.payLists[i].id;
-        // delete this.payLists[i].collectionTypeName;
-        if (this.payLists[i].payMoney * 1 > 0) {
-          // payLists.push(this.payLists[i]);
-          payLists.push(params);
-        }
-      }
-      for (let i in this.rechargeAccountList) {
-        if (this.rechargeAccountList[i].spendMoney * 1 > 0) {
-          delete this.rechargeAccountList[i].cardOver;
-          delete this.rechargeAccountList[i].isShow;
-          delete this.rechargeAccountList[i].isShows;
-          delete this.rechargeAccountList[i].cardOvers;
-          delete this.rechargeAccountList[i].offsetMoney;
-          delete this.rechargeAccountList[i].card;
-          rechargeAccountList.push(this.rechargeAccountList[i]);
-        }
-      }
-
+      // var payLists = [];
+      // var rechargeAccountList = [];
+      // // 用作删除数组
+      // const auxiliaryArr = ['isShow','state','collectionType','id','collectionTypeName']
+      // for (let i =0;i<this.payLists.length;i++) {
+      //   let params = {...this.payLists[i]}
+      //   params.payId = this.payLists[i].id;
+      //   params.payName = this.payLists[i].collectionTypeName;
+      //   auxiliaryArr.forEach(item=>{
+      //     delete params[item]
+      //   })
+      //   if (this.payLists[i].payMoney * 1 > 0) {
+      //     payLists.push(params);
+      //   }
+      // }
+      // for (let i in this.rechargeAccountList) {
+      //   if (this.rechargeAccountList[i].spendMoney * 1 > 0) {
+      //     delete this.rechargeAccountList[i].cardOver;
+      //     delete this.rechargeAccountList[i].isShow;
+      //     delete this.rechargeAccountList[i].isShows;
+      //     delete this.rechargeAccountList[i].cardOvers;
+      //     delete this.rechargeAccountList[i].offsetMoney;
+      //     delete this.rechargeAccountList[i].card;
+      //     rechargeAccountList.push(this.rechargeAccountList[i]);
+      //   }
+      // }
       let salesmens = [];
       this.managerLists.forEach((item) => {
         if (item.id) {
@@ -1381,55 +1552,55 @@ export default {
           salesmens.push(item);
         }
       });
-      this.form.salesmens = salesmens;
-      this.form.payLists = payLists;
-      this.form.staffLists = staffLists;
-      this.form.rechargeAccountList = rechargeAccountList;
-      if (this.sessionStorageData.buycourse == true) {
-        if (this.form.payLists.length == 0) {
-          if (
-            this.form.debtMoney >=
-            this.sessionStorageData.balance * 1 + 0.01
-          ) {
-            this.form.isDebt = 1;
-          } else {
-            this.form.isDebt = 0;
-            this.form.debtMoney = 0;
-          }
-        } else {
-          if (this.form.debtMoney > 0) {
-            this.form.isDebt = 1;
-          } else {
-            this.form.isDebt = 0;
-          }
-        }
-      } else {
-        if (this.form.debtMoney > 0) {
-          this.form.isDebt = 1;
-        } else {
-          this.form.isDebt = 0;
-        }
-      }
-      if (this.form.debtMoney < 0) {
-        this.form.debtMoney = 0;
-      }
-      if (this.form.integralCheckbox == false) {
-        this.form.integral = 0;
-        this.form.collectionIntegralAmount = 0;
-      } else {
-        this.form.integral = this.form.consumeIntegral;
-        this.form.collectionIntegralAmount = this.form.integralMoney;
-      }
-      this.form.courseReatmentAmount =
-        (
-          this.form.collectionCashAmount +
-          this.collectionRechargeAmounts +
-          this.form.collectionIntegralAmount
-        ).toFixed(2) * 1;
-
-      this.form.courseReatmentAmount = this.form.courseReatmentAmount * 1;
-      this.form.numberTimes = this.form.numberTimes * 1;
+      // this.form.salesmens = salesmens;
+      // this.form.payLists = payLists;
+      // this.form.staffLists = staffLists;
+      // this.form.rechargeAccountList = rechargeAccountList;
+      // if (this.sessionStorageData.buycourse == true) {
+      //   if (this.form.payLists.length == 0) {
+      //     if (
+      //       this.form.debtMoney >=
+      //       this.sessionStorageData.balance * 1 + 0.01
+      //     ) {
+      //       this.form.isDebt = 1;
+      //     } else {
+      //       this.form.isDebt = 0;
+      //       this.form.debtMoney = 0;
+      //     }
+      //   } else {
+      //     if (this.form.debtMoney > 0) {
+      //       this.form.isDebt = 1;
+      //     } else {
+      //       this.form.isDebt = 0;
+      //     }
+      //   }
+      // } else {
+      //   if (this.form.debtMoney > 0) {
+      //     this.form.isDebt = 1;
+      //   } else {
+      //     this.form.isDebt = 0;
+      //   }
+      // }
+      // if (this.form.debtMoney < 0) {
+      //   this.form.debtMoney = 0;
+      // }
+      // if (this.form.integralCheckbox == false) {
+      //   this.form.integral = 0;
+      //   this.form.collectionIntegralAmount = 0;
+      // } else {
+      //   this.form.integral = this.form.consumeIntegral;
+      //   this.form.collectionIntegralAmount = this.form.integralMoney;
+      // }
+      // this.form.courseReatmentAmount =
+      //   (
+      //     this.form.collectionCashAmount +
+      //     this.collectionRechargeAmounts +
+      //     this.form.collectionIntegralAmount
+      //   ).toFixed(2) * 1;
+      // this.form.courseReatmentAmount = this.form.courseReatmentAmount * 1;
+      // this.form.numberTimes = this.form.numberTimes * 1;
       var that = this;
+      let form = {salesmens,staffLists}
       if (staffLists.length == 0) {
         this.$confirm("没有选择员工是否保存?", "提示", {
           confirmButtonText: "确定",
@@ -1438,22 +1609,33 @@ export default {
           confirmButtonClass: "confirmbtnFalses",
           type: "warning",
         }).then(() => {
-          that.addCourse();
+          that.addCourse(form);
         }).catch(()=>{
           this.saveloading = false
         });
       } else {
-        that.addCourse();
+        that.addCourse(form);
         that.loading = false;
       }
       setTimeout(() => {
         this.loading = false;
       }, 3000);
     },
-    addCourse() {
+    addCourse(val) {
       setTimeout(() => {
         this.loading = false;
       }, 3000);
+      let courseLists = this.list.map(item=>{
+        return {
+          ...item,...this.form
+        }
+      })
+      let from = {
+        ...val,
+        payLists:this.payLists,
+        courseLists
+      }
+      return
       addcourse(this.form).then((res) => {
         this.loading = false;
         if (res.code == "000000") {
@@ -1597,46 +1779,48 @@ export default {
       });
     },
     //求和
-    num() {
+    num(index) {
       var num = 0;
-      this.payLists.forEach((item) => {
+      this.list[index].payLists.forEach((item) => {
         num += item.payMoney * 1;
       });
-      this.form.collectionCashAmount = num.toFixed(2) * 1;
-      if (this.form.integralCheckbox == true) {
-        this.form.debtMoney =
+      let cardNum = eval(this.list[index].rechargeAccountList.map(item=>{return item.spendMoney*1}).join("+")) //卡付总和
+      this.list[index].collectionCashAmount = num.toFixed(2) * 1; //现金总和
+      console.log(this.list[index].collectionCashAmount,this.list[index].debtMoney,this.list[index].integralCheckbox)
+      if (this.list[index].integralCheckbox == true) {
+        this.list[index].debtMoney =
           (
-            this.form.amount * 1 -
+            this.list[index].amount * 1 -
             this.collectionRechargeAmounts * 1 -
-            this.form.collectionCashAmount * 1 -
-            this.form.collectionIntegralAmount * 1
+            this.list[index].collectionCashAmount * 1 -
+            this.list[index].collectionIntegralAmount * 1
           ).toFixed(2) * 1;
-        this.form.courseReatmentAmount =
+        this.list[index].courseReatmentAmount =
           (
-            this.form.collectionCashAmount * 1 +
+            this.list[index].collectionCashAmount * 1 +
             this.collectionRechargeAmounts * 1 +
-            this.form.collectionIntegralAmount * 1
+            this.list[index].collectionIntegralAmount * 1
           ).toFixed(2) * 1;
 
-        this.form.debtMoney = this.form.debtMoney.toFixed(2) * 1;
+        this.list[index].debtMoney = this.list[index].debtMoney.toFixed(2) * 1;
       } else {
-        this.form.debtMoney =
+        this.list[index].debtMoney =
           (
-            this.form.amount * 1 -
-            this.collectionRechargeAmounts * 1 -
-            this.form.collectionCashAmount * 1
+            this.list[index].amount * 1 -
+            cardNum * 1 -
+            this.list[index].collectionCashAmount * 1
           ).toFixed(2) * 1;
-        this.form.courseReatmentAmount =
+        this.list[index].courseReatmentAmount =
           (
-            this.form.collectionCashAmount * 1 +
+            this.list[index].collectionCashAmount * 1 +
             this.collectionRechargeAmounts * 1
           ).toFixed(2) * 1;
-        this.form.debtMoney = this.form.debtMoney.toFixed(2) * 1;
+        this.list[index].debtMoney = this.list[index].debtMoney.toFixed(2) * 1;
       }
       if (
-        this.form.debtMoney * 1 >
+        this.list[index].debtMoney * 1 >
         (
-          (this.form.amount * this.sessionStorageData.debtRatio * 1) /
+          (this.list[index].amount * this.sessionStorageData.debtRatio * 1) /
           100
         ).toFixed(2) *
           1
@@ -1645,59 +1829,62 @@ export default {
           message:
             "本次支付金额最多可以欠款 : " +
             (
-              (this.form.amount * this.sessionStorageData.debtRatio * 1) /
+              (this.list[index].amount * this.sessionStorageData.debtRatio * 1) /
               100
             ).toFixed(2) *
               1,
         });
       }
+      this.list.push({})
+      this.list.pop()
     },
-    cardnum() {
+    cardnum(index) {
       let spendMoney = 0;
       let discoutMoney = 0;
-      this.rechargeAccountList.forEach((item) => {
+      this.list[index].rechargeAccountList.forEach((item) => {
         spendMoney += item.spendMoney * 1; //实付金额
         discoutMoney += item.discoutMoney * 1; //抵扣
       });
       if (this.sessionStorageData.buycourse == true) {
-        this.form.collectionRechargeAmount = spendMoney;
-        this.collectionRechargeAmounts = discoutMoney;
+        this.list[index].collectionRechargeAmount = spendMoney;
+        this.list[index].collectionRechargeAmounts = discoutMoney;
       } else {
-        this.form.collectionRechargeAmount = spendMoney;
-        this.collectionRechargeAmounts = spendMoney;
+        this.list[index].collectionRechargeAmount = spendMoney;
+        this.list[index].collectionRechargeAmounts = spendMoney;
       }
 
-      if (this.form.integralCheckbox == true) {
-        this.form.courseReatmentAmount =
+      if (this.list[index].integralCheckbox == true) {
+        this.list[index].courseReatmentAmount =
           (
-            this.form.collectionCashAmount * 1 +
-            this.collectionRechargeAmounts * 1 +
-            this.form.collectionIntegralAmount * 1
+            this.list[index].collectionCashAmount * 1 +
+            this.list[index].collectionRechargeAmounts * 1 +
+            this.list[index].collectionIntegralAmount * 1
           ).toFixed(2) * 1;
-        this.form.debtMoney =
+          this.list[index].debtMoney =
           (
-            this.form.amount * 1 -
-            this.collectionRechargeAmounts * 1 -
-            this.form.collectionCashAmount * 1 -
-            this.form.collectionIntegralAmount * 1
+            this.list[index].amount * 1 -
+            this.list[index].collectionRechargeAmounts * 1 -
+            this.list[index].collectionCashAmount * 1 -
+            this.list[index].collectionIntegralAmount * 1
           ).toFixed(2) * 1;
       } else {
-        this.form.courseReatmentAmount =
+        this.list[index].courseReatmentAmount =
           (
-            this.form.collectionCashAmount * 1 +
-            this.collectionRechargeAmounts * 1
-          ).toFixed(2) * 1;
-        this.form.debtMoney =
-          (
-            this.form.amount * 1 -
-            this.collectionRechargeAmounts * 1 -
-            this.form.collectionCashAmount * 1
+            this.list[index].collectionCashAmount * 1 +
+            this.list[index].collectionRechargeAmounts * 1
           ).toFixed(2) * 1;
+          // this.list[index].debtMoney =
+          // (
+          //   this.list[index].amount * 1 -
+          //   this.list[index].collectionRechargeAmounts * 1 -
+          //   this.list[index].collectionCashAmount * 1
+          // ).toFixed(2) * 1;
+          this.list[index].debtMoney = this.list[index].amount * 1 -(this.selectTabAmount(this.list[index].rechargeAccountList,2) + this.list[index].nowAmount.toFixed(2)*1)
       }
       if (
-        this.form.debtMoney * 1 >
+        this.list[index].debtMoney * 1 >
         (
-          (this.form.amount * this.sessionStorageData.debtRatio * 1) /
+          (this.list[index].amount * this.sessionStorageData.debtRatio * 1) /
           100
         ).toFixed(2) *
           1
@@ -1706,12 +1893,14 @@ export default {
           message:
             "本次支付金额最多可以欠款 : " +
             (
-              (this.form.amount * this.sessionStorageData.debtRatio * 1) /
+              (this.list[index].amount * this.sessionStorageData.debtRatio * 1) /
               100
             ).toFixed(2) *
               1,
         });
       }
+      this.list.push({})
+      this.list.pop()
     },
 
     ctlist() {
@@ -1819,9 +2008,13 @@ export default {
     setPage() {
       this.ctlist();
       this.setStaffRatio();
-      this.sessionStorageData = JSON.parse(
-        sessionStorage.getItem("sessionStorageData")
-      );
+      try{
+        this.sessionStorageData = JSON.parse(
+          sessionStorage.getItem("sessionStorageData")
+        );
+      }catch(err){
+        this.sessionStorageData = {}
+      }
     },
   },
   created() {
@@ -1902,7 +2095,21 @@ export default {
 .reatmen .el-dialog__body {
   padding: 20px 20px;
 }
-
+.reat{
+  overflow:auto
+}
+.right{
+  margin-top: 15px;
+  padding: 0 40px 10px 0;
+  font-size: 12px;
+  box-sizing: border-box;
+  border: 1px solid #ccc;
+  background: white;
+  border-radius: 10px;
+  width: 200px;
+  margin-left: 35px;
+  display: flex;
+}
 .spanrs {
   width: 160px;
 }
@@ -1926,4 +2133,14 @@ export default {
   width: 180px;
   margin: 0 auto;
 }
+.marginAuto{
+  margin-right: 10px;
+  width: 54%;
+}
+/deep/ .reatmen .el-form-item{
+  height: 25% !important;
+}
+.tab{
+  min-width: 20%;
+}
 </style>
diff --git a/src/pages/eashier/service/passcode.vue b/src/pages/eashier/service/passcode.vue
index 5c98ac9..103a94b 100644
--- a/src/pages/eashier/service/passcode.vue
+++ b/src/pages/eashier/service/passcode.vue
@@ -17,7 +17,7 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button size="mini" type="primary" plain @click="handleClose">取 消</el-button>
-      <el-button size="mini" type="primary" @click="confirm()">确 定</el-button>
+      <el-button size="mini" type="primary" @click="confirm">确 定</el-button>
     </span>
   </el-dialog>
 </template>
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index 9d9b020..dc6cca5 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -865,14 +865,9 @@ export default {
           return time.getTime() > Date.now();
         }
       },
-      useRecharge:
-        JSON.parse(sessionStorage.getItem("sessionStorageData")).useRecharge *
-        1,
-      balance:
-        JSON.parse(sessionStorage.getItem("sessionStorageData")).balance * 1 +
-        0.01,
-      memberIntegral: JSON.parse(sessionStorage.getItem("sessionStorageData"))
-        .memberIntegral,
+      useRecharge:JSON.parse(sessionStorage.getItem("sessionStorageData")).useRecharge *1,
+      balance:JSON.parse(sessionStorage.getItem("sessionStorageData")).balance * 1 +0.01,
+      memberIntegral: JSON.parse(sessionStorage.getItem("sessionStorageData")).memberIntegral,
       debtMoneys: 0,
       list: [], //主数组
       listCopy: [],
diff --git a/src/pages/promotion/components/suit.vue b/src/pages/promotion/components/suit.vue
index 5e112b6..f258c14 100644
--- a/src/pages/promotion/components/suit.vue
+++ b/src/pages/promotion/components/suit.vue
@@ -43,7 +43,6 @@ export default {
   methods: {
     //组件传值
     show(form) {
-      console.log("🚀 ~ file: suit.vue ~ line 46 ~ show ~ form", form)
       this.dataList = [];
       this.form = { ...form };
       if (form.promotionStores) {
@@ -52,6 +51,12 @@ export default {
           arr.push(item.storeId);
         });
         this.dataList = arr;
+      }else if (form.rechargeTypeStoreList) {
+        let arr = [];
+        form.rechargeTypeStoreList.forEach((item) => {
+          arr.push(item.storeId);
+        });
+        this.dataList = arr;
       }
       this.dialogVisible = true;
       this.getData();
diff --git a/src/pages/promotion/recpromotion/components/edit.vue b/src/pages/promotion/recpromotion/components/edit.vue
index 4045cdf..365b3f0 100644
--- a/src/pages/promotion/recpromotion/components/edit.vue
+++ b/src/pages/promotion/recpromotion/components/edit.vue
@@ -28,6 +28,19 @@
         <el-input class="form-width" type="number" :disabled="title == '明细'" v-model.trim="form.firstAmount" autocomplete="off" placeholder="请输入首充金额">
         </el-input>
       </el-form-item>
+      <el-form-item label="适用门店:" required prop="storeType">
+        <el-radio-group v-model.trim="form.storeType" style="font-size: 14px">
+          <el-radio :label="0">所有门店</el-radio>
+          <el-radio :label="1">指定门店</el-radio>
+          <el-button
+            :disabled="!(form.storeType === 1)"
+            size="mini"
+            type="text"
+            @click="openSuitStore(form)"
+            ><span>门店列表</span></el-button
+          >
+        </el-radio-group>
+      </el-form-item>
       <el-divider content-position="left">充值</el-divider>
       <el-form-item required label="续充金额" prop="rechargeMoney">
         <el-input class="form-width" type="number" :disabled="title == '明细'" v-model.trim="form.rechargeMoney" autocomplete="off" placeholder="请输入续充金额" maxlength="50"></el-input>
@@ -60,12 +73,15 @@
       <el-button size="mini" @click="close">取 消</el-button>
       <el-button size="mini" type="primary" @click="save">确 定</el-button>
     </div>
+    <suit ref="suit" @suitData="suitData"></suit>
   </el-dialog>
 </template>
 
 <script>
 import { addrecType, editrecType } from "@/api/storeManage.js";
+import suit from "../../components/suit";
 export default {
+  components: { suit },
   data() {
     return {
       form: {}, //主对象
@@ -168,6 +184,19 @@ export default {
   },
   created() {},
   methods: {
+    openSuitStore(row) {
+      this.$refs.suit.show(row);
+    },
+    suitData(v) {
+      let list = [];
+      v.forEach((item) => {
+        if (item.id) {
+          item.storeId = item.id;
+          list.push(item);
+        }
+      });
+      this.form.rechargeTypeStoreList = list;
+    },
     //组件传值
     show(form) {
       if (form == "添加") {
diff --git a/src/pages/statistics/staffBrokerage/detail/index.vue b/src/pages/statistics/staffBrokerage/detail/index.vue
index 4d87518..a207bbe 100644
--- a/src/pages/statistics/staffBrokerage/detail/index.vue
+++ b/src/pages/statistics/staffBrokerage/detail/index.vue
@@ -29,6 +29,7 @@
           {{scope.row.cashComm?scope.row.cashComm:'--'}}
         </template>
       </el-table-column>
+      <el-table-column align="center" min-width="120" prop="cooperationAchi" label="合作方业绩"></el-table-column>
       <el-table-column align="center" min-width="80" prop="totalPerformance" label="总业绩"></el-table-column>
       <el-table-column align="center" min-width="80" prop="totalCommission" label="总提成"></el-table-column>
     </el-table>
diff --git a/src/pages/statistics/staffBrokerage/examine/index.vue b/src/pages/statistics/staffBrokerage/examine/index.vue
index 736db68..72bde09 100644
--- a/src/pages/statistics/staffBrokerage/examine/index.vue
+++ b/src/pages/statistics/staffBrokerage/examine/index.vue
@@ -104,6 +104,7 @@
           {{scope.row.xftlcczhjyj?scope.row.xftlcczhjyj:'--'}}
         </template>
       </el-table-column>
+      <el-table-column align="center" min-width="120" prop="cooperationAchi" label="合作方业绩"></el-table-column>
       <el-table-column align="center" min-width="120" prop="zyj" label="总业绩"></el-table-column>
       <el-table-column align="center" min-width="120" prop="totaltc" label="总提成"></el-table-column>
       <el-table-column align="center" min-width="120" prop="ntmoney" label="内调金额"></el-table-column>
diff --git a/src/pages/statistics/staffBrokerage/staffBrokerage.vue b/src/pages/statistics/staffBrokerage/staffBrokerage.vue
index 9ead528..7fcf6a3 100644
--- a/src/pages/statistics/staffBrokerage/staffBrokerage.vue
+++ b/src/pages/statistics/staffBrokerage/staffBrokerage.vue
@@ -112,6 +112,7 @@
       </el-table-column>
 
       <el-table-column align="center" min-width="120" prop="ntmoney" label="内调金额"></el-table-column>
+      <el-table-column align="center" min-width="120" prop="cooperationAchi" label="合作方业绩"></el-table-column>
       <el-table-column align="center" min-width="120" prop="zyj" label="总业绩"></el-table-column>
       <el-table-column align="center" min-width="120" prop="totaltc" label="总提成"></el-table-column>
       <el-table-column align="center" min-width="120" prop="totalWages" label="结算"></el-table-column>