diff --git a/dist.zip b/dist.zip
index 22d1b9a..4031c6f 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/api/eashier.js b/src/api/eashier.js
index 0356d47..544092f 100644
--- a/src/api/eashier.js
+++ b/src/api/eashier.js
@@ -350,13 +350,20 @@ export function recEditStaff(params) {
 }
 
 //添加疗程单
+// export function addcourse(params) {
+//   return service({
+//     url: "/api" + "/demay/ssm/course/add",
+//     method: "post",
+//     data: params
+//   });
+// }
 export function addcourse(params) {
-  return service({
-    url: "/api" + "/demay/ssm/course/add",
-    method: "post",
-    data: params
-  });
-}
+    return service({
+      url: "/api" + "/demay/ssm/course/addList",
+      method: "post",
+      data: params
+    });
+  }
 //疗程单列表
 export function coursepage(params) {
   return service({
diff --git a/src/components/repayment/components/cancel.vue b/src/components/repayment/components/cancel.vue
index eea64e7..77d989e 100644
--- a/src/components/repayment/components/cancel.vue
+++ b/src/components/repayment/components/cancel.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :close-on-click-modal="false" v-dialogDrag title="取消欠款" :visible.sync="cancelDialogVisible" width="650px" append-to-body :before-close="handleCloseCancel">
+  <el-dialog :close-on-click-modal="false" v-dialogDrag title="取消欠款" :visible.sync="cancelDialogVisible" width="45%" append-to-body :before-close="handleCloseCancel">
     <el-form label-width="120px" inline>
       <div v-if="form.docType=='promotion_card_use'">
         <el-form-item label="会员名称">
@@ -60,6 +60,12 @@
         </el-table>
       </div>
       <div v-else>
+        <el-form-item label="会员名称">
+          {{form.memberName}}
+        </el-form-item>
+        <el-form-item label="手机号码">
+          {{form.mobilePhone}}
+        </el-form-item>
         <el-form-item label="欠款帐户">
           {{form.tradeName}}
         </el-form-item>
diff --git a/src/components/staffList/admin/index.vue b/src/components/staffList/admin/index.vue
index d0d0370..813ff7f 100644
--- a/src/components/staffList/admin/index.vue
+++ b/src/components/staffList/admin/index.vue
@@ -12,7 +12,7 @@
       <el-table-column align="center" prop="ratio" label="占比(%)" width="80">
         <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(0)*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)" :disabled="scope.$index==0"></el-input>
diff --git a/src/components/staffList/manager/index.vue b/src/components/staffList/manager/index.vue
index 561c381..76e577e 100644
--- a/src/components/staffList/manager/index.vue
+++ b/src/components/staffList/manager/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(0)*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"
diff --git a/src/components/trading/components/cash.vue b/src/components/trading/components/cash.vue
index 9483772..d22d97a 100644
--- a/src/components/trading/components/cash.vue
+++ b/src/components/trading/components/cash.vue
@@ -259,6 +259,9 @@ export default {
             if(item.accountType == 'project_consume'&& item.docType == 'card_change'){
               item.docTypeName = '加价转疗程转出'
             }
+            if(item.accountType == 'project' && item.docType=='promotion'){
+              item.docTypeName = '促销活动'
+            }
             if(item.accountType == 'project'){
               item.docTypeName = '加价转疗程转入'
             }
diff --git a/src/pages/eashier/noArrears/components/cancelArrears.vue b/src/pages/eashier/noArrears/components/cancelArrears.vue
index 2a1b29a..b7637e5 100644
--- a/src/pages/eashier/noArrears/components/cancelArrears.vue
+++ b/src/pages/eashier/noArrears/components/cancelArrears.vue
@@ -262,9 +262,25 @@ export default {
         }
       });
     },
+
+  },
+  watch:{
+    dialogFormVisible:{
+      handler(show){
+        if(show){
+          this.queryForm= {
+            pageNum: 1,
+            pageSize: 10,
+          },
+          this.init()
+        }
+      },
+      immediate:true
+    }
   },
   created() {
-    this.getOption()
+    // this.getOption()
+    // this.init()
   },
 };
 </script>
diff --git a/src/pages/eashier/reatment/components/detail.vue b/src/pages/eashier/reatment/components/detail.vue
index 41d3fdf..8e50b92 100644
--- a/src/pages/eashier/reatment/components/detail.vue
+++ b/src/pages/eashier/reatment/components/detail.vue
@@ -206,8 +206,10 @@ export default {
       );
       this.getData(form);
       form.rechargeConsumeList.forEach((items) => {
-        items.cardOver = items.cardConsumeMoney + items.spendMoney;
-        items.cardOvers = items.cardConsumeMoney;
+        let cardOver = (items.cardConsumeMoney + items.spendMoney).toFixed(2)*1;
+        let cardOvers = items.cardConsumeMoney.toFixed(2)*1;
+        items.cardOver = cardOver
+        items.cardOvers = cardOvers
       });
     },
     getData(row) {
diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue
index 57feed2..2e74b06 100644
--- a/src/pages/eashier/reatment/reatment.vue
+++ b/src/pages/eashier/reatment/reatment.vue
@@ -10,7 +10,7 @@
             <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button>
           </div>
         </el-form-item>
-        <el-form-item label="会员名字:" label-width="160px">
+        <el-form-item label="会员名字:" label-width="140px">
           <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>
@@ -29,6 +29,18 @@
             <el-button size="mini" type="text" @click="openMoney()">去还款</el-button>
           </div>
         </el-form-item>
+        <el-form-item v-if="form.mobilePhone" label="成交额">
+          <div class="form-width-ms"><span class="text-price text-red">{{ amountType(1) }}</span></div>
+        </el-form-item>
+        <el-form-item v-if="form.mobilePhone" label="卡付">
+          <div class="form-width-ms"><span class="text-price text-red">{{ amountType(2) }}</span></div>
+        </el-form-item>
+        <el-form-item v-if="form.mobilePhone" label="现付">
+          <div class="form-width-ms"><span class="text-price text-red">{{ amountType(3) }}</span></div>
+        </el-form-item>
+        <el-form-item v-if="form.mobilePhone" label="欠款">
+          <div class="form-width-ms"><span class="text-price text-red">{{ amountType(4) }}</span></div>
+        </el-form-item>
         <br />
         <!-- <el-form-item label="疗程编码:">
           <div class="form-width-ms flex ">
@@ -228,7 +240,7 @@
             </template>
         </el-table-column>
       </el-table>
-      <div class="reat" style="display:flex;margin-top:20px;align-content:space-between">
+      <div class="reat">
         <div class="margin-bottom-xs marginAuto">
           <span  style="flex:1">员工/门店管理层/高管业绩</span>
           <div style="display: flex">
@@ -259,7 +271,7 @@
             <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">
+          <!-- <div class="right">
             <el-form ref="form" label-width="65px">
                 <el-form-item label="成交额:">
                   <span class="text-price text-red">{{ amountType(1) }}</span>
@@ -274,7 +286,7 @@
                   <span class="text-price text-red">{{ amountType(4) }}</span>
                 </el-form-item>
             </el-form>
-          </div>  
+          </div>   -->
       </div>
       <div class="reatmen">
         <!-- 保存列表弹窗 -->
@@ -561,7 +573,7 @@ export default {
       sessionStorageData: {}, //门店参数集合
       editStaffRatioRow: "",
       radioEditStaffList: {},
-      formLabelwidth: "80px",
+      formLabelwidth: "70px",
       rechargeAccountList: [], //卡付列表
       collectionCashAmount: "",
       editStaffDailogtitle: "",
@@ -1500,7 +1512,6 @@ export default {
 
     //保存确定方法
     save() {
-      // this.payLists
       // this.form.courseReatmentAmount = parseInt(this.paidAmount)
       // this.form.debtMoney = parseInt(this.treatAmount)
       // ----
@@ -1627,16 +1638,36 @@ export default {
       }, 3000);
       let courseLists = this.list.map(item=>{
         return {
-          ...item,...this.form
+          ...item,
+          mobilePhone:this.form.mobilePhone,
+          memberName:this.form.memberName,
+          memberId:this.form.memberId,
+          sex:this.form.sex,
+          isDebt:item.debtMoney?1:0,
+          isAddition:this.isAddition,
+          collectionCashAmount:item.nowAmount
         }
       })
-      let from = {
+      var payLists = [];
+      // 用作删除数组
+      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);
+        }
+      }
+      let form = {
         ...val,
-        payLists:this.payLists,
+        payLists,
         courseLists
       }
-      return
-      addcourse(this.form).then((res) => {
+      addcourse(form).then((res) => {
         this.loading = false;
         if (res.code == "000000") {
           this.empty();
@@ -2023,7 +2054,11 @@ export default {
 };
 </script>
 <style scoped>
-*>>>.el-input-group--append .el-input__inner{
+.form-width-ms{
+  width: 0.65rem !important;
+  z-index: 999999999 !important;
+}
+>>>.el-input-group--append .el-input__inner{
   width: 123px;
 }
 .reatmen {
@@ -2096,6 +2131,9 @@ export default {
   padding: 20px 20px;
 }
 .reat{
+  margin-top: 20px;
+  display: flex;
+  justify-content: space-around;
   overflow:auto
 }
 .right{
diff --git a/src/pages/storeManage/baseProject/components/edit.vue b/src/pages/storeManage/baseProject/components/edit.vue
index bfc5ddc..0cc9412 100644
--- a/src/pages/storeManage/baseProject/components/edit.vue
+++ b/src/pages/storeManage/baseProject/components/edit.vue
@@ -297,19 +297,19 @@ export default {
             this.form.minumumTimes = 1;
           }
           if (this.title == "添加") {
-            if (
-              this.sessionStorageData.allowValid == 1 &&
-              this.form.directConsumption == 0 &&
-              this.form.validTime == null
-            ) {
-              this.$alert("请设置项目有效期限", "提示", {
-                confirmButtonText: "确定",
-                confirmButtonClass: "confirmbtnFalses",
-                type: "warning",
-                center: true,
-                callback: (action) => {},
-              });
-            } else {
+            // if (
+            //   this.sessionStorageData.allowValid == 1 &&
+            //   this.form.directConsumption == 0 &&
+            //   this.form.validTime == null
+            // ) {
+            //   this.$alert("请设置项目有效期限", "提示", {
+            //     confirmButtonText: "确定",
+            //     confirmButtonClass: "confirmbtnFalses",
+            //     type: "warning",
+            //     center: true,
+            //     callback: (action) => {},
+            //   });
+            // } else {
               if (this.form.directConsumption == 1) {
                 this.form.validTime == 0;
               }
@@ -350,7 +350,7 @@ export default {
                   });
                 }
               });
-            }
+            // }
           } else {
             let falg = false;
             if (this.form.directConsumption == true) {
@@ -360,19 +360,19 @@ export default {
               }
             }
             if (falg == false) {
-              if (
-                this.sessionStorageData.allowValid == 1 &&
-                this.form.directConsumption == 0 &&
-                this.form.validTime == null
-              ) {
-                this.$alert("请设置项目有效期", "提示", {
-                  confirmButtonText: "确定",
-                  confirmButtonClass: "confirmbtnFalses",
-                  type: "warning",
-                  center: true,
-                  callback: (action) => {},
-                });
-              } else {
+              // if (
+              //   this.sessionStorageData.allowValid == 1 &&
+              //   this.form.directConsumption == 0 &&
+              //   this.form.validTime == null
+              // ) {
+              //   this.$alert("请设置项目有效期", "提示", {
+              //     confirmButtonText: "确定",
+              //     confirmButtonClass: "confirmbtnFalses",
+              //     type: "warning",
+              //     center: true,
+              //     callback: (action) => {},
+              //   });
+              // } else {
                 if (this.form.directConsumption == 1) {
                   this.form.validTime = 0;
                 }
@@ -407,7 +407,7 @@ export default {
                     });
                   }
                 });
-              }
+              // }
             } else {
               this.$alert("直接消费项目需要设置散客价格 / 散客最低价", "提示", {
                 confirmButtonText: "确定",