diff --git a/src/api/login.js b/src/api/login.js
index 88301ad..933a5fd 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -17,6 +17,24 @@ export function phoneLogin(params) {
     data: params
   });
 }
+// 修改密码
+export function upcashPassword(params){
+  return service({
+    url: "/api" + "/demay/ssm/staffLogin/chekeMsg",
+    method: "post",
+    data: params
+  });
+}
+
+// 校验验证码
+export function chekeMsg(params){
+  return service({
+    url: "/api" + "/demay/ssm/staffLogin/chekeMsg",
+    method: "post",
+    data: params
+  });
+}
+
 //门店员工手机密码登陆获取token接口
 export function phonePassLogin(params) {
   return service({
diff --git a/src/home/components/projectListCharts.vue b/src/home/components/projectListCharts.vue
index 2df235d..46d8f78 100644
--- a/src/home/components/projectListCharts.vue
+++ b/src/home/components/projectListCharts.vue
@@ -45,68 +45,68 @@
 <script>
 export default {
     methods:{
-        loading(){
-     this.$echarts
-        .init(document.getElementById("projectListCharts"))
-        .setOption({
-          backgroundColor: "#eee",
-          title: {
-            text: "项目贡献统计",
-            subtext: new Date().toLocaleDateString(),
-            right: 10,
-            y: 10,
-          },
-          tooltip: {
-            trigger: "item",
-            showDelay: 20,
-            formatter: "{a} <br/>{b} : ¥{c} ({d}%)",
-            padding: 5,
-          },
-          legend: {
-            orient: "vertical",
-            left: "left",
-            itemWidth: 16,
-            data: [
-              "个人面部基础护理",
-              "面部补水保湿",
-              "面部美白嫩肤",
-              "火山泥SAP",
-              "面部理疗",
-              "洗剪吹",
-              "烫发",
-              "做发",
-              "染发",
-              "洗发",
-            ],
-          },
-          series: [
-            {
-              name: "项目贡献",
-              type: "pie",
-              radius: "50%",
-              center: ["55%", "65%"],
+      loading(){
+       this.$echarts
+          .init(document.getElementById("projectListCharts"))
+          .setOption({
+            backgroundColor: "#eee",
+            title: {
+              text: "项目贡献统计",
+              subtext: new Date().toLocaleDateString(),
+              right: 10,
+              y: 10,
+            },
+            tooltip: {
+              trigger: "item",
+              showDelay: 20,
+              formatter: "{a} <br/>{b} : ¥{c} ({d}%)",
+              padding: 5,
+            },
+            legend: {
+              orient: "vertical",
+              left: "left",
+              itemWidth: 16,
               data: [
-                { value: 3688, name: "洗剪吹" },
-                { value: 685, name: "烫发" },
-                { value: 982, name: "做发" },
-                { value: 1099, name: "染发" },
-                { value: 1005, name: "个人面部基础护理" },
-                { value: 1788, name: "面部补水保湿" },
-                { value: 1890, name: "面部美白嫩肤" },
-                { value: 1355, name: "面部理疗" },
-                { value: 7900, name: "火山泥SAP" },
+                "个人面部基础护理",
+                "面部补水保湿",
+                "面部美白嫩肤",
+                "火山泥SAP",
+                "面部理疗",
+                "洗剪吹",
+                "烫发",
+                "做发",
+                "染发",
+                "洗发",
               ],
-              emphasis: {
-                itemStyle: {
-                  shadowBlur: 10,
-                  shadowOffsetX: 0,
-                  shadowColor: "rgba(0, 0, 0, 0.5)",
+            },
+            series: [
+              {
+                name: "项目贡献",
+                type: "pie",
+                radius: "50%",
+                center: ["55%", "65%"],
+                data: [
+                  { value: 3688, name: "洗剪吹" },
+                  { value: 685, name: "烫发" },
+                  { value: 982, name: "做发" },
+                  { value: 1099, name: "染发" },
+                  { value: 1005, name: "个人面部基础护理" },
+                  { value: 1788, name: "面部补水保湿" },
+                  { value: 1890, name: "面部美白嫩肤" },
+                  { value: 1355, name: "面部理疗" },
+                  { value: 7900, name: "火山泥SAP" },
+                ],
+                emphasis: {
+                  itemStyle: {
+                    shadowBlur: 10,
+                    shadowOffsetX: 0,
+                    shadowColor: "rgba(0, 0, 0, 0.5)",
                 },
               },
             },
           ],
         });
-        },
+      },
     },
     mounted(){
         this.loading()
diff --git a/src/layout/components/Emain.vue b/src/layout/components/Emain.vue
index a587b81..71c6226 100644
--- a/src/layout/components/Emain.vue
+++ b/src/layout/components/Emain.vue
@@ -22,7 +22,7 @@
         </el-dropdown>
       </div>
     </div>
-    <div class="padding-top padding-left padding-right">
+    <div class="padding">
       <transition name="fade" mode="out-in">
         <!-- <keep-alive> -->
           <router-view />
@@ -159,6 +159,10 @@ export default {
 .fade-enter, .fade-leave-to {
     opacity: 0;
 }
+.padding{
+  padding: 10px 10px 0 10px;
+  box-sizing: border-box;
+}
 .tags {
   overflow: hidden;
   padding-left: 20px;
diff --git a/src/pages/eashier/components/signature.vue b/src/pages/eashier/components/signature.vue
index 176eba4..ae3a3e5 100644
--- a/src/pages/eashier/components/signature.vue
+++ b/src/pages/eashier/components/signature.vue
@@ -31,9 +31,7 @@ export default {
       this.resultImg = "";
     },
     handleGenerate() {
-      this.$refs.esign
-        .generate()
-        .then((res) => {
+      this.$refs.esign.generate().then((res) => {
           this.resultImg = res;
           this.isSHow = true;
           this.$emit("imageValue", this.base64ToFile(res, "jpg"));
diff --git a/src/pages/eashier/refund/components/staffratio.vue b/src/pages/eashier/refund/components/staffratio.vue
index 4c10a65..736ccea 100644
--- a/src/pages/eashier/refund/components/staffratio.vue
+++ b/src/pages/eashier/refund/components/staffratio.vue
@@ -7,8 +7,8 @@
         <el-table-column align="center" :label="staffTitle">
           <el-table-column min-width="140" align="center" label="员工">
             <template slot-scope="scope">
-              <el-select filterable default-first-option v-model="scope.row.label" placeholder="请选择" @change="editChange($event,scope.$index)">
-                <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
+              <el-select filterable  v-model="scope.row.label" placeholder="请选择" @change="editChange($event,scope.$index)" value-key='label'>
+                <el-option v-for="(item) in options"  :key="item.label" :label="item.label" :value="item.id">
                 </el-option>
               </el-select>
             </template>
@@ -65,6 +65,13 @@ export default {
       this.changeStaff();
     },
     editChange(e, index) {
+      console.log('e--->',e)
+      let idx = this.list.findIndex(item=>item.id === e)
+      console.log(idx)
+      if(idx!= -1){ //重复限制
+        this.list[index] = {}
+        return this.$message.warning({message: "员工已存在",});
+      }
       let row = this.list[index];
       let form = {};
       this.options.forEach((item) => {
@@ -88,6 +95,7 @@ export default {
     },
     //组件传值
     show(form, text) {
+      console.log('form->',form,'text->',text)
       this.list = [];
       this.form = { ...form };
       this.staffText = text;
@@ -109,6 +117,7 @@ export default {
       if (text == "managerList") {
         this.staffTitle = "高管";
       }
+      form[text] = form[text].filter(item=>item.id)
       this.list = form[text];
       this.list.forEach((item) => {
         if (item.id) {
@@ -129,7 +138,7 @@ export default {
           that.list.indexOf(v) === -1 || that.staffListCopy.indexOf(v) === -1
         );
       });
-      this.options = list;
+      // this.options = list;1
     },
     //获取数据
     async getData() {
diff --git a/src/pages/eashier/refund/refund.vue b/src/pages/eashier/refund/refund.vue
index 2ea641d..f50b134 100644
--- a/src/pages/eashier/refund/refund.vue
+++ b/src/pages/eashier/refund/refund.vue
@@ -50,7 +50,6 @@
           <el-input v-model="refundMoney" type="number"></el-input>
         </div>
       </el-form-item><br>
-
       <el-form-item label="补偿金额:" :label-width="formLabelwidth" prop="compensation">
         <div class="form-width-ms">
           <el-input v-model="compensation" type="number"></el-input>
@@ -72,7 +71,7 @@
         </div>
       </el-form-item>
       <br />
-      <el-table style="max-width:1080px;margin-left:30px" max-height="500" :data="refCashLists" :row-class-name="rowClassName" :row-key='getRowKeys' @expand-change="expandSelect" :expand-row-keys="expand" v-if="refCashListsShow" @selection-change="selRoleChangeHand" @row-click="handleRowClick" ref="multipleTable" highlight-current-row row-key="index">
+      <el-table style="max-width:1080px;margin-left:30px" max-height="500" :data="refCashLists" :row-class-name="rowClassName" :row-key='getRowKeys' @expand-change="expandSelect" :expand-row-keys="expand" v-if="refCashListsShow" @selection-change="selRoleChangeHand" @row-click="handleRowClick" ref="multipleTable" highlight-current-row>
         <el-table-column type="expand">
           <template slot-scope="scope">
             <div class="flex justify-start align-center flex-wrap">
@@ -923,6 +922,7 @@ export default {
       this.sessionStorageData = JSON.parse(
         sessionStorage.getItem("sessionStorageData")
       );
+      this.getData()
     },
     //提交信息
     submit() {
@@ -967,7 +967,6 @@ export default {
         item.manageIdentity = this.refund.manageIdentity;
         item.manageNumber = this.refund.manageNumber;
       });
-      //console.log(this.multipleSelection);
       this.multipleSelection.forEach((item) => {
         item.memberName = this.refund.memberName;
         item.memberId = this.refund.memberId;
@@ -1113,9 +1112,11 @@ export default {
     },
     //选择单据选中
     selRoleChangeHand(row) {
+      console.log('这里吗--->')
       if (this.title != "明细") {
       }
       this.multipleSelection = row;
+      console.log('multipleSelection--->',this.multipleSelection)
       let num = 0;
       let sum = 0;
       let compensationNum = 0;
@@ -1483,7 +1484,7 @@ export default {
       this.fileData.append("payee", this.payee);
       this.fileData.append("refundNum", this.radiorefValueList.refundNum);
 
-      //console.log(this.multipleSelection);
+      console.log('---->',this.multipleSelection);
       this.multipleSelection.forEach((item) => {
         item.projectId = item.id;
         item.memberName = this.refund.memberName;
@@ -1762,6 +1763,7 @@ export default {
     this.sessionStorageData = JSON.parse(
       sessionStorage.getItem("sessionStorageData")
     );
+    this.getData()
   },
   watch: {
     refDialogVisible(val, oldVal) {
diff --git a/src/pages/eashier/refundRecharge/service/passcode.vue b/src/pages/eashier/refundRecharge/service/passcode.vue
index bf01194..67829b4 100644
--- a/src/pages/eashier/refundRecharge/service/passcode.vue
+++ b/src/pages/eashier/refundRecharge/service/passcode.vue
@@ -12,7 +12,7 @@
       <el-form-item v-if="
               this.sessionStorageList.memberPay == 1 || this.sessionStorageList.memberPay == 2
             " label="签字确认: ">
-        <signature style="width: 400px; height: 300px" @imageValue="imageValue" ref="signature"></signature>
+        <signature style="width: 400px; height: 300px" @imageValue='imageValue' ref="signature"></signature>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -96,20 +96,6 @@ export default {
 
     passKeydown(e) {
       this.confirm();
-      // let keyCode = e.keyCode;
-      // if (keyCode === 8 || keyCode === 46) {
-      //   //backspace 和delete
-      //   let len = this.$refs.passId.value.length;
-      //   if (len === 1) {
-      //     this.$refs.passId.value = "";
-      //     return false;
-      //   }
-      //   if (e.target.selectionStart === 0 && e.target.selectionEnd === len) {
-      //     this.$refs.passId.value = "";
-      //     return false;
-      //   }
-      // }
-      // return true;
     },
     //组件传值
     show(form) {
diff --git a/src/pages/eashier/service/captcha.vue b/src/pages/eashier/service/captcha.vue
new file mode 100644
index 0000000..bb88310
--- /dev/null
+++ b/src/pages/eashier/service/captcha.vue
@@ -0,0 +1,196 @@
+<template>
+<el-dialog
+  :title="title"
+  :visible.sync="dialogVisible"
+  width="30%"
+  :before-close="handleClose">
+  <div class="radio">
+    <el-form ref="form" :model="form" label-width="55px" label-position='left'>
+      <el-form-item label="修改方式">
+        <el-radio v-model="radio" label="1">原密码</el-radio>
+        <el-radio v-model="radio" label="2">验证码</el-radio>
+      </el-form-item> 
+    </el-form>  
+  </div>
+  <div class="maxbox" v-if="radio==1">
+    <div class="box">
+        <div class="box1" >
+             <el-form ref="form" :model="form" label-width="55px" label-position='left'>
+                <el-form-item label="原密码">
+                    <el-input v-model="oldPassword" placeholder="请重新输入原密码" style="width:150px"></el-input>
+                </el-form-item>
+                <el-form-item label="新密码">
+                    <el-input type="password" v-model="newPassword" placeholder="请重新输入新密码" style="width:150px"></el-input>
+                </el-form-item>
+                <el-form-item label="新密码">
+                    <el-input type="password" v-model="newPassword2" placeholder="请再次输入新密码" style="width:150px"></el-input>
+                </el-form-item>
+            </el-form>
+        </div>
+    </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="passwordConfirms" :loading='passwordLoading'>确 认</el-button>
+        </span>
+    </div>
+  </div>
+  <div class="maxbox" v-if="radio==2">
+    <div class="box">
+        <div class="center">
+            <el-form ref="form" :model="form" label-width="55px" label-position='left'>
+                <el-form-item label="验证码">
+                    <el-input v-model="inpt" 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="primary">{{codeBtnWord}}</el-button>
+        </div>
+        <div class="center">
+            <el-form ref="form" :model="form" label-width="55px" label-position='left'>
+                <el-form-item label="新密码">
+                    <el-input type="password" v-model="password" style="width:150px" placeholder="请输入新密码"></el-input>
+                </el-form-item>
+                <el-form-item label="新密码">
+                    <el-input type="password" v-model="password2" style="width:150px" placeholder="请重新输入密码"></el-input>
+                </el-form-item>
+            </el-form>
+        </div>
+    </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='codeLoading'>确 认</el-button>
+        </span>
+    </div>
+  </div>
+</el-dialog>
+</template>
+
+<script>
+export default {
+    data () {
+        return {
+            form:{},
+            passwordLoading:false,
+            codeLoading:false,
+            oldPassword:"",//原密码
+            newPassword2:"",
+            newPassword:"",//新密码
+            radio:'1',
+            inpt:"",
+            password:"",
+            password2:"",
+            titleName:2,
+            dialogVisible:false,
+            codeBtnWord:'获取验证码',
+            timer:null,
+            waitTime:61 //验证码失效时间
+        }
+    },
+    computed:{
+        title(){
+            return this.radio == '1'?'原密码修改':'验证码修改'
+        },
+        // 控制获取验证码按钮是否可点击
+        getCodeBtnDisable:{
+            get(){
+                if(this.waitTime == 61){
+                    return false
+                }
+                return true
+            },
+            // 注意：因为计算属性本身没有set方法，不支持在方法中进行修改，而下面我要进行这个操作，所以需要手动添加
+            set(){} 
+        }
+    },
+    methods:{
+        passwordConfirms(){
+            this.handleNewPassword()
+        },
+        handleNewPassword(){
+            this.passwordLoading=true
+            this.$emit('handleNewPassword',this.newPassword)
+        },
+        handleCloseCancel(){
+            this.dialogVisible = false
+            clearInterval(this.timer)
+            this.codeBtnWord = '获取验证码'
+            this.getCodeBtnDisable = false
+            this.waitTime = 61
+            Object.assign(this.$data, this.$options.data()) 
+        },
+        handleClose(done){
+            done()
+            // 清除定时器
+            clearInterval(this.timer)
+            this.codeBtnWord = '获取验证码'
+            this.getCodeBtnDisable = false
+            this.waitTime = 61
+            Object.assign(this.$data, this.$options.data())
+        },
+        confirms(){
+            this.submit()
+        },
+        getCode(){
+           // 调用获取短信验证码接口
+           this.$emit('getCodeOperate')
+           // 因为下面用到了定时器，需要保存this指向
+           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{
+                   clearInterval(this.timer)
+                   that.codeBtnWord = '获取验证码'
+                   that.getCodeBtnDisable = false
+                   that.waitTime = 61
+               }
+           },1000)
+        },
+        submit(){
+            this.codeLoading = true
+            this.$emit('handleSubimt',this.password)
+        }
+    }
+}
+</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/pages/eashier/service/detail/detail.vue b/src/pages/eashier/service/detail/detail.vue
index 08068b9..e39cf3e 100644
--- a/src/pages/eashier/service/detail/detail.vue
+++ b/src/pages/eashier/service/detail/detail.vue
@@ -51,8 +51,8 @@
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip min-width="100" align="center" prop="payType" label="支付类型"></el-table-column> 
-      <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionRechargeAmount" label="卡付金额"></el-table-column>
-      <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionCashAmount" label="现付金额"></el-table-column>    
+      <el-table-column show-overflow-tooltip min-width="75" align="center" prop="rechargeSum" label="卡付金额"></el-table-column>
+      <el-table-column show-overflow-tooltip min-width="75" align="center" prop="cashSum" label="现付金额"></el-table-column>    
       <el-table-column align="center" prop="inputBy" label="录单人" show-overflow-tooltip min-width="80"></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" label="明细" width="76" fixed="right">
@@ -122,6 +122,7 @@ export default {
 
     // 打印方法
     print(row) {
+
       this.printForm = row;
       this.printForm.printDate = new Date();
       this.printForm.telephone = JSON.parse(
@@ -130,8 +131,9 @@ export default {
       this.printForm.storeName = JSON.parse(
         sessionStorage.getItem("storeInfo")
       ).storeName;
+      console.log('row--->',row)
       cashsignature({
-        cashNum: row.cashNum,methods
+        cashNum: row.cashNum
       }).then((res) => {
         if (res.code == "000000" && res.data) {
           this.printForm.signature =
diff --git a/src/pages/eashier/service/mixins.js b/src/pages/eashier/service/mixins.js
index e94b3b2..6bfb78e 100644
--- a/src/pages/eashier/service/mixins.js
+++ b/src/pages/eashier/service/mixins.js
@@ -17,13 +17,6 @@ export const Mixins = {
                     this.$set(firstItem,'CardCurrentUse',firstItem.cardConsumeMoney*1 - firstItem.cardSum*1 + firstItem.spendMoney*1)
                     // 可用余额
                     this.$set(firstItem,'cardOvers',firstItem.CardCurrentUse*1 - firstItem.spendMoney*1)
-                    try{
-                        firstItem.cardSum = firstItem.cardSum.toFixed(2) * 1
-                        firstItem.CardCurrentUse = firstItem.CardCurrentUse.toFixed(2) * 1
-                        firstItem.cardOvers = firstItem.cardOvers.toFixed(2) * 1
-                    }catch(err){
-                        
-                    }
                 })
             }
             return row
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index 6857892..d1a0b06 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -88,6 +88,7 @@
         <course ref="course" @courseData="courseData"></course>
         <el-button slot="reference">项目包</el-button>
       </el-popover>
+      <el-button v-if="cashNumber ===1 " @click="updataPassword">密码修改</el-button>
       <el-form-item label="补单日期:" v-if="isAddition == 1">
         <div class="activeFormDiv">
           <el-date-picker
@@ -101,8 +102,8 @@
         </div>
       </el-form-item>
     </el-form>
-    <div class="flex justify-start align-start ">
-      <div class="into-table-width">
+    <div>
+      <div style="margin-bottom:20px">
         <el-table
           style="margin-top:3px;"
           :data="list"
@@ -119,7 +120,7 @@
             color: '#eeeeee'
           }"
         >
-          <el-table-column type="expand">
+          <!-- <el-table-column type="expand">
             <template slot-scope="scope">
               <div class="flex justify-start align-center  flex-wrap ">
                 <el-form inline class="margin-top-xs margin-left-xs">
@@ -144,7 +145,6 @@
                         >
                         </el-option>
                       </el-select>
-                      <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.zhonggongLists=null,scope.row.zhonggongList.splice(0,1)"></div> -->
                       <div
                         class="el-icon-edit-outline text-xs text-cyan"
                         @click.stop="
@@ -176,7 +176,6 @@
                         >
                         </el-option>
                       </el-select>
-                      <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.largeLists=null,scope.row.largeList.splice(0,1)"></div> -->
                       <div
                         class="el-icon-edit-outline text-xs text-cyan"
                         @click.stop="
@@ -206,7 +205,6 @@
                         >
                         </el-option>
                       </el-select>
-                      <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.technicianLists=null,scope.row.technicianList.splice(0,1)"></div> -->
                       <div
                         class="el-icon-edit-outline text-xs text-cyan"
                         @click.stop="
@@ -238,7 +236,6 @@
                         >
                         </el-option>
                       </el-select>
-                      <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.smallLists=null,scope.row.smallList.splice(0,1)"></div> -->
                       <div
                         class="el-icon-edit-outline text-xs text-cyan"
                         @click.stop="
@@ -266,7 +263,6 @@
                         >
                         </el-option>
                       </el-select>
-                      <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.managerLists=null,scope.row.managerList.splice(0,1)"></div> -->
                       <div
                         class="el-icon-edit-outline text-xs text-cyan"
                         @click.stop="
@@ -294,7 +290,6 @@
                         >
                         </el-option>
                       </el-select>
-                      <!-- <div class="el-icon-circle-close text-xs text-cyan" @click.stop="scope.row.adminLists=null,scope.row.adminList.splice(0,1)"></div> -->
                       <div
                         class="el-icon-edit-outline text-xs text-cyan"
                         @click.stop="
@@ -307,10 +302,10 @@
                 </el-form>
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             show-overflow-tooltip
-            min-width="140"
+            min-width="150"
             align="center"
             label="项目选项"
           >
@@ -345,7 +340,7 @@
             align="center"
             prop="noDiscount"
             label="卡付打折"
-            width="50"
+            width="100"
           >
             <template slot-scope="scope">{{
               scope.row.noDiscount == 0
@@ -357,7 +352,7 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            min-width="80"
+            min-width="120"
             align="center"
             prop="transactionPrice"
             label="项目金额"
@@ -380,7 +375,7 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            min-width="80"
+            min-width="120"
             align="center"
             prop=""
             label="支付类型"
@@ -511,18 +506,18 @@
                         label="赠送剩余"
                         width="70"
                       ></el-table-column>
-                      <el-table-column
+                      <!-- <el-table-column
                         align="center"
                         prop="cardConsumeMoney"
                         label="可用金额"
-                        width="70"
+                        width="50"
                       ></el-table-column>
                       <el-table-column
                         align="center"
                         prop="CardCurrentUse"
                         show-overflow-tooltip
                         label="当前行可用"
-                        width="110"
+                        width="50"
                       >
                       <template slot-scope="scope">
                         {{ scope.row.CardCurrentUse?scope.row.CardCurrentUse:scope.row.cardOvers }}
@@ -533,11 +528,11 @@
                         prop="cardSum"
                         show-overflow-tooltip
                         label="本单使用"
-                        width="110"
+                        width="50"
                       >
                       <template slot-scope="scope">
                         {{ scope.row.cardSum?scope.row.cardSum:0 }}
-                      </template></el-table-column>
+                      </template></el-table-column> -->
                       <el-table-column
                         align="center"
                         prop="storeName"
@@ -557,7 +552,7 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            min-width="75"
+            min-width="120"
             align="center"
             prop="collectionAmounts"
             label="卡付抵扣金额"
@@ -570,7 +565,7 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            min-width="75"
+            min-width="120"
             align="center"
             prop="collectionRechargeAmount"
             label="卡付金额"
@@ -581,11 +576,9 @@
             </span>
           </template>
           </el-table-column>
-          <!-- <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionCashAmount" label="现付金额">
-          </el-table-column> -->
           <el-table-column
             show-overflow-tooltip
-            width="75"
+            width="100"
             align="center"
             prop="sex"
             label="性别"
@@ -597,9 +590,207 @@
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column label="美发师" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div class="flex align-center form-width-m">
+                <el-select
+                  filterable
+                  default-first-option
+                  clearable
+                  @clear="clear(scope.row, 'zhonggongList')"
+                  v-model="scope.row.zhonggongLists"
+                  placeholder="请选择"
+                  :ref="'zhonggongList'+scope.$index"
+                  @change="
+                    handleChange($event, scope.row, 'zhonggongList',scope.$index)
+                  "
+                  style="width:110px"
+                >
+                  <el-option
+                    v-for="(item, index) in options"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+                <div
+                  class="el-icon-edit-outline text-xs text-cyan"
+                  @click.stop="
+                    openStaffRatio(
+                      scope.row,
+                      scope.$index,
+                      'zhonggongList'
+                    )
+                  "
+                ></div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="美容师" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div class="flex align-center form-width-m">
+                <el-select
+                  filterable
+                  default-first-option
+                  clearable
+                  :ref="'largeList'+scope.$index"
+                  @clear="clear(scope.row, 'largeList')"
+                  v-model="scope.row.largeLists"
+                  placeholder="请选择"
+                  @change="handleChange($event, scope.row, 'largeList',scope.$index)"
+                  style="width:110px"
+                >
+                  <el-option
+                    v-for="(item, index) in options"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              <div
+                class="el-icon-edit-outline text-xs text-cyan"
+                @click.stop="
+                  openStaffRatio(scope.row, scope.$index, 'largeList')
+                "
+              ></div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="技师" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div class="flex align-center form-width-m">
+                <el-select
+                  filterable
+                  default-first-option
+                  clearable
+                  @clear="clear(scope.row, 'technicianLists')"
+                  v-model="scope.row.technicianLists"
+                  placeholder="请选择"
+                  :ref="'technicianList'+scope.$index"
+                  @change="
+                    handleChange($event, scope.row, 'technicianList',scope.$index)
+                  "
+                  style="width:110px"
+                >
+                  <el-option
+                    v-for="(item, index) in options"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+                <div
+                  class="el-icon-edit-outline text-xs text-cyan"
+                  @click.stop="
+                    openStaffRatio(
+                      scope.row,
+                      scope.$index,
+                      'technicianList'
+                    )
+                  "
+                ></div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="助理" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div class="flex align-center form-width-m">
+                <el-select
+                  filterable
+                  default-first-option
+                  clearable
+                  @clear="clear(scope.row, 'smallLists')"
+                  v-model="scope.row.smallLists"
+                  placeholder="请选择"
+                  :ref="'smallList'+scope.$index"
+                  @change="handleChange($event, scope.row, 'smallList',scope.$index)"
+                  style="width:110px"
+                >
+                  <el-option
+                    v-for="(item, index) in options"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+                <div
+                  class="el-icon-edit-outline text-xs text-cyan"
+                  @click.stop="
+                    openStaffRatio(scope.row, scope.$index, 'smallList')
+                  "
+                ></div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="高管" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div class="flex align-center form-width-m">
+                <el-select
+                  filterable
+                  default-first-option
+                  clearable
+                  @clear="clear(scope.row, 'managerLists')"
+                  v-model="scope.row.managerLists"
+                  placeholder="请选择"
+                  :ref="'managerList'+scope.$index"
+                  @change="handleChange($event, scope.row, 'managerList',scope.$index)"
+                  style="width:110px"
+                >
+                  <el-option
+                    v-for="(item, index) in managerOptions"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+                <div
+                  class="el-icon-edit-outline text-xs text-cyan"
+                  @click.stop="
+                    openStaffRatio(scope.row, scope.$index, 'managerList')
+                  "
+                ></div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="管理层" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div class="flex align-center form-width-m">
+                <el-select
+                  filterable
+                  default-first-option
+                  clearable
+                  @clear="clear(scope.row, 'adminLists')"
+                  v-model="scope.row.adminLists"
+                  placeholder="请选择"
+                  :ref="'adminList'+scope.$index"
+                  @change="handleChange($event, scope.row, 'adminList',scope.$index)"
+                  style="width:110px"
+                >
+                  <el-option
+                    v-for="(item, index) in adminOptions"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+                <div
+                  class="el-icon-edit-outline text-xs text-cyan"
+                  @click.stop="
+                    openStaffRatio(scope.row, scope.$index, 'adminList')
+                  "
+                ></div>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            min-width="120"
+            min-width="80"
             align="center"
             prop="remark"
             label="备注"
@@ -612,14 +803,13 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            min-width="120"
+            min-width="100"
             align="center"
             prop="storeName"
             label="所属门店"
           >
           </el-table-column>
-          <el-table-column width="80" align="center" label="操作">
-            <!-- fixed="right" -->
+          <el-table-column width="100" align="center" label="操作">
             <template slot-scope="scope">
               <el-button
                 :disabled="scope.row.editNumber == 1"
@@ -633,7 +823,147 @@
           </el-table-column>
         </el-table>
       </div>
-      <div
+      <!-- 提交恢复--- -->
+      <!-- <div
+        class="border-radius-10 border margin-left-xs  bg-white padding-xs"
+        style="margin-right:2%"
+      >
+        <div
+          class="flex justify-center align-center text-bold padding-bottom-xs"
+        >
+          <div class="form-width-m ">
+            <span class=" ">总付金额:</span>
+            <span class="text-red text-price">
+              {{ total }}
+            </span>
+          </div>
+          <div class="form-width-m">
+            <span class=" ">现付金额:</span>
+            <span class="text-red text-price">
+              {{ appearPrices }}
+            </span>
+          </div>
+        </div>
+        <payment ref="payment" @paymentData="paymentData" :form='form' :payLists='payLists'></payment>
+      </div> -->
+    </div>
+    <div class="box-flex">
+      <div class="flexA">
+        <div class="center"  style="margin-right:15px">
+        <el-table
+          style="margin-top:3px;width:100%"
+          :data="cardList"
+          :row-key="getRowKeys"
+          :header-cell-style="{
+            background: 'linear-gradient(#6cb3ff, #1873d4)',
+            color: '#eeeeee'
+          }"
+        >
+        <el-table-column label="充值卡付" align="center">
+          <el-table-column
+            show-overflow-tooltip
+            min-width="80px"
+            align="center"
+            label="卡名"
+            prop="rechargeTypeName"
+          >
+        </el-table-column>
+        <el-table-column
+            show-overflow-tooltip
+            min-width="80px"
+            align="center"
+            label="折扣"
+            prop="discount"
+          >
+        </el-table-column>
+        <el-table-column label="用前金额" align="center">
+          <el-table-column
+            show-overflow-tooltip
+            align="center"
+            label="充值"
+            min-width="110"
+            prop="cardRestMoney"
+          >
+          <template slot-scope="scope">
+            {{ scope.row.cardRestMoney?scope.row.cardRestMoney:0 }}
+          </template>
+        </el-table-column>
+        <el-table-column
+            show-overflow-tooltip
+            align="center"
+            prop="giftConsumeMoney"
+            label="赠送"
+            min-width="110"
+          >
+          <template slot-scope="scope">
+            {{ scope.row.giftConsumeMoney?scope.row.giftConsumeMoney:0 }}
+          </template>
+        </el-table-column>
+        </el-table-column>
+        <el-table-column label="使用金额" align="center">
+          <el-table-column
+              show-overflow-tooltip
+              align="center"
+              prop="numConsume"
+              min-width="110"
+              label="充值"
+            >
+            <template slot-scope="scope">
+              {{ scope.row.numConsume?scope.row.numConsume:0 }}
+            </template>
+          </el-table-column>
+          <el-table-column
+              show-overflow-tooltip
+              align="center"
+              prop="giveConsume"
+              min-width="110"
+              label="赠送"
+            >
+            <template slot-scope="scope">
+              {{ scope.row.giveConsume?scope.row.giveConsume:0 }}
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="剩余金额" align="center">
+          <el-table-column
+              show-overflow-tooltip
+              align="center"
+              prop="numRemainder"
+              min-width="110"
+              label="充值"
+            >
+            <template slot-scope="scope">
+              {{ scope.row.numRemainder }}
+            </template>
+          </el-table-column>
+          <el-table-column
+              show-overflow-tooltipprojectData
+              align="center"
+              min-width="110"
+              prop="giveRemainder"
+              label="赠送"
+            >
+            <template slot-scope="scope">
+              {{  scope.row.giveRemainder }}
+            </template>
+          </el-table-column>
+        </el-table-column>
+        </el-table-column>
+        </el-table>
+        </div>
+        <div class="right">
+          <el-form ref="form" label-width="65px">
+            <el-form-item label="结算金额:">
+              <span>{{numlist[0].settlementNum}}</span>
+            </el-form-item>
+            <el-form-item label="支付金额:">
+              <span>{{numlist[0].payNum}}</span>
+            </el-form-item>
+          </el-form>
+          <!-- <div id="Charts" style="width:100%;height:200px"></div> -->
+        </div>
+        <div class="left" style="margin-right:15px">
+        <div
         class="border-radius-10 border margin-left-xs  bg-white padding-xs"
         style="margin-right:2%"
       >
@@ -643,61 +973,55 @@
           <div class="form-width-m ">
             <span class=" ">总付金额:</span>
             <span class="text-red text-price">
-              <!-- {{ form.cashAmount.toFixed(2)*1 }} -->
               {{ total }}
             </span>
           </div>
           <div class="form-width-m">
             <span class=" ">现付金额:</span>
             <span class="text-red text-price">
-              <!-- {{ form.collectionCashAmounts }} -->
               {{ appearPrices }}
             </span>
           </div>
         </div>
         <payment ref="payment" @paymentData="paymentData" :form='form' :payLists='payLists'></payment>
       </div>
+        </div>
+       </div>
+       <div class="flexB">
+        <div style="width:100%;margin-bottom:15px">
+            <el-button size="samll" icon="el-icon-add" type="primary" @click="addPro">添加项目</el-button>
+        </div>
+        <div style="width:100%;margin-bottom:15px">
+           <el-button size="samll" type="primary" plain @click="openList">收银列表</el-button>
+        </div>
+        <div style="width:100%;margin-bottom:15px">
+          <el-button size="samll" type="primary" plain @click="goBack">{{isAddition == 1 ? "收银操作" : "  补单操作"}}</el-button>
+        </div>
+        <div style="width:100%;margin-bottom:15px">
+          <el-button size="samll" type="primary" plain @click="notData" >清空页面</el-button>
+        </div>
+        <div style="width:100%;margin-bottom:15px">
+          <el-button size="samll" type="primary" @click="confirm()">确认收银</el-button>
+        </div>
+       </div>
     </div>
     <member ref="member" @memberData="memberData"></member>
     <staffratio ref="staffratio" @staffratioData="staffratioData"></staffratio>
     <passcode ref="passcode" @passcodeData="passcodeData"></passcode>
     <project ref="project" @projectData="projectData"></project>
-    <div class="flex justify-start padding-right padding-top">
-      <div class="into-table-width flex justify-center" style="height:45px">
-        <el-button
-          size="samll"
-          icon="el-icon-add"
-          type="primary"
-          @click="addPro"
-          >添加项目</el-button
-        >
-        <el-button size="samll" type="primary" plain @click="openList"
-          >收银列表</el-button
-        >
-
-        <el-button size="samll" type="primary" plain @click="goBack">{{
-          isAddition == 1 ? "收银" : "补单"
-        }}</el-button>
-        <el-button size="samll" type="primary" plain @click="notData"
-          >清空页面</el-button
-        >
-        <div class="padding-left padding-right"></div>
-        <el-button size="samll" type="primary" @click="confirm()"
-          >确认收银</el-button
-        >
-      </div>
-      <div></div>
-    </div>
     <repayment ref="repayment" @repaymentData="inputMember"></repayment>
     <addmember ref="addmember"></addmember>
     <orders ref="orders"></orders>
     <message :message="message" ref="message"></message>
+    <captcha @handleSubimt='handleSubimt' @getCodeOperate='getCodeOperate'  @handleNewPassword='handleNewPassword' ref="captcha"/>
   </div>
 </template>
 <script>
 import { Mixins } from './mixins'
 import addmember from "@/components/member/edit/index";
-import message from './detail/message.vue'
+import message from './detail/message.vue';
+import captcha from './captcha.vue';
+import { getSmsCode,chekeMsg,upcashPassword } from '@/api/login.js'
 import {
   selectList,
   selectListType,
@@ -736,10 +1060,13 @@ export default {
     repayment,
     recash,
     orders,
-    message
+    message,
+    captcha
   },
   data() {
     return {
+      cardList:[],
+      numlist:[{settlementNum:0,payNum:0}],
       message:"",
       pickerOptions: {
         disabledDate(time) {
@@ -887,6 +1214,112 @@ export default {
     }
   },
   methods: {
+    // 输入新密码
+    handleNewPassword(val){
+      let params = {
+        cashPassword:this.$refs.captcha.oldPassword,
+        cashPasswordnew1:this.$refs.captcha.newPassword,
+        cashPasswordnew2:this.$refs.captcha.newPassword2,
+        mobilePhone:this.memberForm.mobilePhone,
+        id:this.memberForm.id
+      }
+      upcashPassword(params).then(res=>{
+        this.$refs.captcha.passwordLoading = false
+        if(res.code == '000000'){
+          this.$message.success({ message: "密码更改成功" });
+          this.$refs.captcha.handleCloseCancel()
+        }else{
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      })
+    },
+    // 点击密码修改
+    updataPassword(){
+      this.$refs.captcha.dialogVisible = true
+    },
+    // 获取验证码
+    getCodeOperate(){
+      let params = {
+        mobilePhone:this.memberForm.mobilePhone
+      }
+      getSmsCode(params).then(res=>{
+        if(res.code == '000000'){
+          this.$message.success({ message: "验证码已发送,注意查看手机" });
+        }
+      })
+    }, 
+    // 验证码修改密码提交
+    handleSubimt(val){
+      let params = {
+        codeMsg:this.$refs.captcha.inpt,
+        cashPasswordnew1:this.$refs.captcha.password,
+        cashPasswordnew2:this.$refs.captcha.password2,
+        mobilePhone:this.memberForm.mobilePhone,
+        id:this.memberForm.id
+      }
+      upcashPassword(params).then(res=>{
+        this.$refs.captcha.codeLoading = false
+        if(res.code == '000000'){
+          this.$message.success({ message: "密码修改成功" });
+          this.$refs.captcha.handleCloseCancel()
+        }else{
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      })
+    },
+    // 动态处理充值卡付数据
+    cardListUpdata(){
+      this.cardList  = this.recListCopy //由于第一次过滤掉了，第二次是空数组，需要重新赋值
+      this.cardList.forEach((item1)=>{
+        item1.numCard = 0 //卡付金额
+        item1.cardGive = 0 //卡付赠送
+        this.list.forEach((item2)=>{
+          item2.rechargeAccountList.forEach(item3=>{
+            if(item1.id === item3.id){
+              item3.spendMoney = item3.spendMoney?item3.spendMoney*1:0
+              item3.giftSpendMoney = item3.giftSpendMoney?item3.giftSpendMoney*1:0
+              item1.numCard +=  item3.spendMoney
+              item1.cardGive += item3.giftSpendMoney
+            }
+          })
+        })
+        this.$set(item1,'numConsume',(item1.numCard).toFixed(2)*1) //卡付金额使用
+        this.$set(item1,'giveConsume',(item1.cardGive).toFixed(2)*1) //卡付赠送使用
+        this.$set(item1,'numRemainder',(item1.cardRestMoney - item1.numCard).toFixed(2)*1) //卡付金额剩余
+        this.$set(item1,'giveRemainder',(item1.giftConsumeMoney - item1.cardGive).toFixed(2)*1) //卡付赠送剩余
+      })
+      this.updateNum()
+      // 过滤只要使用过的卡
+      this.cardList = this.cardList.filter(item=>{
+        return item.numConsume || item.giveConsume
+      })
+    },
+    // 处理echart数据层
+    updateNum(){
+      let total = eval(this.$refs.payment.payLists.map(item=>{return item.payMoney?item.payMoney*1:0}).join("+"))//现金总和
+      let collectionRechargeAmount = eval(this.list.map(item=>{return item.collectionRechargeAmount?item.collectionRechargeAmount*1:0}).join("+"))
+      if(this.list.length){
+        this.numlist=[{settlementNum:total+collectionRechargeAmount,payNum:total+collectionRechargeAmount}]
+      }else if(!collectionRechargeAmount&&total){
+        this.numlist=[{settlementNum:total,payNum:total}]
+      }else if(!total&&collectionRechargeAmount){
+        this.numlist=[{settlementNum:collectionRechargeAmount,payNum:collectionRechargeAmount}]
+      }else{
+        this.numlist=[{settlementNum:0,payNum:0}]
+      }
+    },
     projectindex(index) {
       this.projectIndex = index;
     },
@@ -898,15 +1331,14 @@ export default {
         Object.assign(this.$data, this.$options.data.call(this));
         this.cashNumber = 1;
       }
+      this.notData()
     },
     openList() {
       this.$refs.orders.show();
     },
-
     clear(row, text) {
       let form = { ...row };
       form[text] = [];
-
       this.list.splice(row.index, 1, form);
     },
     // 修改list每行抵扣金额/卡付金额
@@ -922,10 +1354,11 @@ export default {
         collectionRechargeAmount = collectionRechargeAmount.toFixed(2)*1
         collectionAmounts = collectionAmounts.toFixed(2)*1
         this.$set(this.list[this.projectIndex],'collectionRechargeAmount',collectionRechargeAmount)
-        if(this.list[this.projectIndex].collectionRechargeAmount>=this.list[this.projectIndex].transactionPrice ){
-          this.list[this.projectIndex].collectionRechargeAmount = (this.list[this.projectIndex].transactionPrice).toFixed(2)*1
-        } //误差
         this.$set(this.list[this.projectIndex],'collectionAmounts',collectionAmounts)
+        // 误差
+        if((this.list[this.projectIndex].transactionPrice-this.list[this.projectIndex].collectionAmounts)<=this.balance*1 ){
+          this.list[this.projectIndex].collectionAmounts = (this.list[this.projectIndex].transactionPrice).toFixed(2)*1
+        } 
       }else{
         // 不能打折的计算
         this.list[this.projectIndex].rechargeAccountList.forEach(item=>{
@@ -936,10 +1369,11 @@ export default {
         collectionAmounts = collectionAmounts.toFixed(2)*1
         this.$set(this.list[this.projectIndex],'collectionRechargeAmount',collectionRechargeAmount)
         this.$set(this.list[this.projectIndex],'collectionAmounts',collectionAmounts)
-        if(this.list[this.projectIndex].collectionRechargeAmount>=this.list[this.projectIndex].transactionPrice ){
-          this.list[this.projectIndex].collectionRechargeAmount = (this.list[this.projectIndex].transactionPrice).toFixed(2)*1
+        if((this.list[this.projectIndex].transactionPrice-this.list[this.projectIndex].collectionAmounts)<=this.balance*1 ){
+          this.list[this.projectIndex].collectionAmounts = (this.list[this.projectIndex].transactionPrice).toFixed(2)*1
         } //误差
       }
+      this.cardListUpdata()
     },
     //修改卡付金额
     editcard(row, index) {
@@ -1010,7 +1444,7 @@ export default {
               // this.updataList()
             }
           }
-
+ 
         }else{
           // 不能打折
           let total = row.cardOvers + row.cardGiftOvers
@@ -1023,7 +1457,7 @@ export default {
             giveProportion = giveProportion.toFixed(2)*1
             row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1
             row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1
-            row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
+            row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
           }else{ 
             row.spendMoney = row.cardOvers
             row.giftSpendMoney = row.cardGiftOvers
@@ -1031,7 +1465,6 @@ export default {
             // this.updataList()
           }
         }
-        this.spendMoney = row.spendMoney
       }else{ //先用实冲，再用赠送
         console.log('来到了门店参数2--->')
         //做法 扣除本次支付/赠送支付/赠送剩余 
@@ -1045,7 +1478,7 @@ export default {
         if(total>appearPrice){ //当前赠送够支付
           row.giftSpendMoney = (appearPrice*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1)).toFixed(2)*1
           row.spendMoney = row.giftSpendMoney
-          row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
+          row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
         }else{ //当前卡不够支付
           row.spendMoney = row.cardGiftOvers
           row.giftSpendMoney = row.cardGiftOvers
@@ -1061,7 +1494,7 @@ export default {
             let remainderCsee = appearPrice - ((row.spendMoney/row.discount)*100) //剩余支付
             console.log('还需要支付多少--->',remainderCsee)
             row.giftSpendMoney = remainderCsee*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1) //算出还需支付多少
-            row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
+            row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
           }
         }else{ //折后金额总和不够支付项目金额,直接扣除
           row.spendMoney = row.cardOvers // 支付金额 直接赋值支付金额
@@ -1075,7 +1508,7 @@ export default {
             if( total>appearPrice ){ //当前卡够支付
               row.spendMoney = appearPrice
               row.giftSpendMoney = appearPrice
-              row.cardGiftOvers = (row.cardGiftOvers - appearPrice).toFixed(2)*1
+              row.cardGiftOvers = row.cardGiftOvers - appearPrice
             }else{ //当前卡剩余余额不够支付
               row.spendMoney = row.cardGiftOvers
               row.giftSpendMoney = row.cardGiftOvers
@@ -1090,7 +1523,7 @@ export default {
             let remainderCsee = appearPrice - row.cardOvers //赠送还要补充多少
             row.spendMoney = row.cardOvers
             row.giftSpendMoney = remainderCsee
-            row.cardGiftOvers = (row.cardGiftOvers - remainderCsee).toFixed(2)*1
+            row.cardGiftOvers = row.cardGiftOvers - remainderCsee
            }
           }else{ //当前卡不够支付项目金额
             row.spendMoney = row.cardOvers
@@ -1102,7 +1535,6 @@ export default {
         console.log('上一次的值是多少呢------>',this.spendMoney)
       }
     },
-
     endEditcard(row, index) { //看不懂别乱改!!!!!! 
       //  卡付抵扣金额collectionAmounts  卡付金额collectionRechargeAmount
       //  本次支付spendMoney 可用金额cardConsumeMoney  可用余额cardOvers 可用折扣discount  赠送折扣discountFreeAmount  赠送支付giftSpendMoney 赠送剩余cardGiftOvers 
@@ -1666,11 +2098,9 @@ export default {
       this.sumAmont();
     },
     openRec(row,idx) {
-      console.log('这是什么row--->',row)
       // // 处理多个popover只显示一次
         this.list.forEach((item,index)=>{
         if(idx!==index){
-          // item.popover = false
           this.$set(item,'popover',false)
         }
       })
@@ -1686,7 +2116,7 @@ export default {
             })
           })
           let total = firstItem.cardGiftOvers - eval(list.map(item=>item.giftSpendMoney?item.giftSpendMoney*1:0).join("+"))
-          row.rechargeAccountList[index].cardGiftOvers = total
+          row.rechargeAccountList[index].cardGiftOvers =( total?total.toFixed(2)*1:0 )
         })
       })
     },
@@ -1786,7 +2216,44 @@ export default {
       this.list.splice(row.index, 1, form);
       this.sumAmont();
     },
-    handleChange(data, row, text) {
+    triggerInit(text,index){
+      switch (text){
+        case 'zhonggongList': //美发师
+        this.$nextTick(()=>{
+          this.$refs['largeList'+index].$el.querySelector('input').focus() //search里面的input获得焦点
+          this.$refs['largeList'+index].toggleMenu() //自动展示
+        })
+        break;
+        case 'largeList': //美容师
+        this.$nextTick(()=>{
+          this.$refs['technicianList'+index].$el.querySelector('input').focus()
+          this.$refs['technicianList'+index].toggleMenu() //自动展示
+        })
+        break;  
+        case 'technicianList': //技师
+        this.$nextTick(()=>{
+          this.$refs['smallList'+index].$el.querySelector('input').focus()
+          this.$refs['smallList'+index].toggleMenu() //自动展示
+        })
+        break; 
+        case 'smallList': //助理
+        this.$nextTick(()=>{
+          this.$refs['managerList'+index].$el.querySelector('input').focus()
+          this.$refs['managerList'+index].toggleMenu() //自动展示
+        })
+        break; 
+        case 'managerList': //高管
+        this.$nextTick(()=>{
+          this.$refs['adminList'+index].$el.querySelector('input').focus()
+          this.$refs['adminList'+index].toggleMenu() //自动展示
+        })
+        break; 
+        case 'adminLists': //管理层
+        break; 
+      }
+    },
+    handleChange(data, row, text,index) {
+      this.$refs.zhonggongList0.blur()
       let form = { ...row };
       if (text == "managerList") {
         this.managerOptions.forEach((item, index) => {
@@ -1817,11 +2284,13 @@ export default {
         });
       }
       this.list.splice(row.index, 1, form);
+      if(data)this.triggerInit(text,index)
     },
     goPayDebt() {
       this.$refs.repayment.show(this.memberForm);
     },
     inputMember() {
+      console.log('到了这里--->')
       if (partten.phoneNum.test(this.memberForm.mobilePhone)) {
         storeMemberOne({
           mobilePhone: this.memberForm.mobilePhone,
@@ -1988,9 +2457,6 @@ export default {
             }
           }
           if (this.proIndex != -1) {
-            // if (this.list[this.proIndex].projectName) {
-            //   this.czRecList(this.list[this.proIndex]);
-            // }
             form.index = this.proIndex;
             console.log('form.index--->',form.index)
             this.list.splice(this.proIndex, 1, form);
@@ -2271,6 +2737,7 @@ export default {
         item.payMoney = 0;
       });
       this.sumAmont();
+      this.cardListUpdata()
     },
     //打开选择会员弹窗
     openMember() {
@@ -2298,6 +2765,12 @@ export default {
       this.form = v.form;
       this.payLists = v.list;
       this.sumAmont();
+      if(this.list.length){
+        this.updateNum()
+      }else{
+        let total = eval(this.$refs.payment.payLists.map(item=>{return item.payMoney?item.payMoney*1:0}).join("+"))//现金/卡付总和
+        this.numlist=[{settlementNum:total,payNum:total}]
+      }
     },
     rowClassName({ row, rowIndex }) {
       row.index = rowIndex;
@@ -2620,6 +3093,8 @@ export default {
         if (res.code == "000000") {
           this.rechargeAccountList = res.rows;
           this.recListCopy = JSON.parse(JSON.stringify(res.rows));
+          this.cardList = res.rows
+          this.cardListUpdata()
           this.list.forEach(item => {
             item.rechargeAccountList = this.rechargeAccountList;
           });
@@ -2693,6 +3168,7 @@ export default {
         }
       });
       this.getCt();
+      this.updateNum()
     },
     getCt() {
       ctlist({
@@ -2861,6 +3337,7 @@ export default {
         });
       }, 500);
       this.setPage();
+      console.log('点击了清空界面')
     },
     setPage() {
       this.getDetail();
@@ -2871,11 +3348,37 @@ export default {
   },
   created() {
     this.notData()
-  }
+    }
 };
 </script>
 
 <style scoped>
+.box-flex{
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
+}
+.flexA{
+  width: 90%;
+  overflow-x: auto;
+  display: -webkit-box;
+  -webkit-overflow-scrolling: touch;
+  display: flex;
+}
+.flexB{
+  text-align: center;
+  width: 8%;
+}
+.right{
+  padding: 0 40px 10px 0;
+  font-size: 12px;
+  line-height: 12px;
+  box-sizing: border-box;
+  border: 1px solid #ccc;
+  background: white;
+  border-radius: 10px;
+  height: 0.45rem;
+}
 .el-icon-edit-outline {
   padding-left: 5px;
 }
diff --git a/src/pages/statistics/staffBrokerage/staffBrokerage.vue b/src/pages/statistics/staffBrokerage/staffBrokerage.vue
index e2296b3..9ead528 100644
--- a/src/pages/statistics/staffBrokerage/staffBrokerage.vue
+++ b/src/pages/statistics/staffBrokerage/staffBrokerage.vue
@@ -135,7 +135,7 @@ export default {
   components: { perform },
   data() {
     return {
-      days: "",
+      days:'',
       tableDate: [{}],
       month: partten.months,
       pickerOptions: {
@@ -169,6 +169,12 @@ export default {
       },
     };
   },
+  created(){
+    let sDate = this.formatTime(new Date(), "YYYY-MM-DD 00:00:00");
+    let eDate = this.formatTime(new Date(), "YYYY-MM-DD 23:59:59");
+    this.days = [sDate, eDate];
+    this.changeMonth(this.days)
+  },
   methods: {
     //导出方法
     exit() {
@@ -253,7 +259,7 @@ export default {
       });
     },
     changeMonth(res) {
-      console.log(res);
+      console.log(res)
       let date = this.formatTime(res[1], "YYYY-MM-DD 23:59:59");
       var form = { startDate: res[0], endDate: date };
       let month = this.formatTime(this.month, "YYYY-MM");
diff --git a/src/pages/storeManage/memberList/memberList.vue b/src/pages/storeManage/memberList/memberList.vue
index 68db06e..f69ee75 100644
--- a/src/pages/storeManage/memberList/memberList.vue
+++ b/src/pages/storeManage/memberList/memberList.vue
@@ -14,27 +14,19 @@
         <el-input
           size="medium"
           style="width:180px;"
-          placeholder="当前页搜索"
-          v-model="input"
-        >
+          placeholder="输入姓名或手机号"
+          v-model="input">
           <i slot="prefix" class="el-input__icon el-icon-search"></i>
         </el-input>
-        <el-button size="mini" type="primary" @click="searchDialog = true"
-          >条件搜索</el-button
-        >
+        <el-button size="mini" type="primary" @click="searchDialog = true">条件搜索</el-button>
         <el-button
           size="mini"
           type="info"
           plain
-          @click="getData((refreshtext = true))"
-          >刷新</el-button
-        >
-        <el-button size="mini" type="primary" @click="download()"
-          >下载模板</el-button
-        >
-        <el-button size="mini" type="warning" @click="infoDialog = true"
-          >导入</el-button
+          @click="getData((refreshtext = true))">刷新</el-button>
+        <el-button size="mini" type="primary" @click="download()">下载模板</el-button
         >
+        <el-button size="mini" type="warning" @click="infoDialog = true">导入</el-button>
         <el-button size="mini" type="success" @click="exit()">导出</el-button>
       </div>
     </div>
@@ -1129,15 +1121,22 @@ export default {
     tableData() {
       var search = this.input.toString().toLowerCase(); //将用户输入的值变字符串并小写
       if (search) {
-        return this.pageInfo.tableList.filter(function(dataNews) {
-          return Object.keys(dataNews).some(function(key) {
-            return (
-              String(dataNews[key])
-                .toLowerCase()
-                .indexOf(search) > -1
-            );
-          });
-        });
+        // return this.pageInfo.tableList.filter(function(dataNews) {
+        //   return Object.keys(dataNews).some(function(key) {
+        //     return (
+        //       String(dataNews[key])
+        //         .toLowerCase()
+        //         .indexOf(search) > -1
+        //     );
+        //   });
+        // });
+        // 输入姓名或者手机号
+        return this.pageInfo.tableList.filter((item,index)=>{
+          item.mobilePhone += ''
+          if(item.mobilePhone.includes(search)||item.memberName.includes(search)){
+            return item
+          }
+        })
       }
       return this.pageInfo.tableList;
     }