From 05efa8b001c73a47582038623564f12458d7b92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E5=98=89=E4=BF=8A?= <2721129340@qq.com>
Date: Thu, 11 May 2023 08:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                               |   4 +-
 package-lock.json                             |   8 +-
 package.json                                  |   2 +-
 src/app.js                                    |   1 -
 .../eashier/collectionList/collectionList.vue | 117 +++++++-
 .../components/record-details.vue             | 109 ++++++++
 src/pages/eashier/collectionList/detail.vue   | 242 ++++++++++++++++
 .../eashier/courseAdjust/components/index.vue |   1 -
 .../eashier/errorOrder/component/index.vue    |   3 +
 .../eashier/proceeds/detail/printform.vue     |  25 --
 .../reatment/components/record-details.vue    | 129 +++++++++
 src/pages/eashier/reatment/detail.vue         | 261 ++++++++++++++++++
 src/pages/eashier/reatment/reatment.vue       | 252 +++++++++--------
 .../eashier/service/detail/printform.vue      | 199 ++++++-------
 src/pages/eashier/service/service.vue         |   4 +-
 .../storeTotalPerformance/index.vue           |  39 +--
 .../storeManage/memberList/memberList.vue     |   2 +-
 17 files changed, 1114 insertions(+), 284 deletions(-)
 create mode 100644 src/pages/eashier/collectionList/components/record-details.vue
 create mode 100644 src/pages/eashier/collectionList/detail.vue
 create mode 100644 src/pages/eashier/reatment/components/record-details.vue
 create mode 100644 src/pages/eashier/reatment/detail.vue

diff --git a/config/index.js b/config/index.js
index 3b757de..7606924 100644
--- a/config/index.js
+++ b/config/index.js
@@ -27,8 +27,8 @@ module.exports = {
     proxyTable: {
       "/api": {
         //  target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
-         target: "http://192.168.31.177:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
-        //  target: "http://192.168.31.177:8085/", //设置你调用的接口域名和端口号 别忘了加http 本地
+        //  target: "http://192.168.31.177:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
+         target: "http://192.168.31.177:8085/", //设置你调用的接口域名和端口号 别忘了加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/package-lock.json b/package-lock.json
index 8a30c33..b50badb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4760,9 +4760,9 @@
       }
     },
     "element-ui": {
-      "version": "2.13.2",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.2.tgz",
-      "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==",
+      "version": "2.15.13",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.13.tgz",
+      "integrity": "sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -9417,7 +9417,7 @@
     "normalize-wheel": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
     },
     "npm-run-path": {
       "version": "2.0.2",
diff --git a/package.json b/package.json
index 64a44c7..8935027 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "decimal.js": "^10.3.1",
     "echarts": "^4.9.0",
     "element-resize-detector": "^1.2.1",
-    "element-ui": "^2.13.2",
+    "element-ui": "^2.15.13",
     "iview": "^3.5.4",
     "jquery": "^3.6.0",
     "lib-flexible": "^0.3.2",
diff --git a/src/app.js b/src/app.js
index 0108b23..db58d2c 100644
--- a/src/app.js
+++ b/src/app.js
@@ -19,7 +19,6 @@ export function isOperateFun() {
       timer = null;
     }
     if (!timer) {
-      //console.log('真好！重新开始')
       handleInterval();
     }
   }
diff --git a/src/pages/eashier/collectionList/collectionList.vue b/src/pages/eashier/collectionList/collectionList.vue
index 5d110d1..68d68c9 100644
--- a/src/pages/eashier/collectionList/collectionList.vue
+++ b/src/pages/eashier/collectionList/collectionList.vue
@@ -161,7 +161,7 @@
       <el-button size="mini" v-if="isAddition==0" type="primary" @click="isAddition = 1" v-role="5003005">补单</el-button>
       <el-button size="mini" v-else type="success" @click="isAddition = 0">充值</el-button>
       <el-button size="mini" type="primary" plain @click="getList(listDialogVisible = true)" v-role="5003001">列表 </el-button>
-      <el-button size="mini" type="primary" :loading="saveloading" @click="save(saveloading = true)" v-role="5003002">提交</el-button>
+      <el-button size="mini" type="primary" :loading="saveloading" @click="save()" v-role="5003002">提交</el-button>
     </div>
     <div>
       <!-- 保存列表弹窗 -->
@@ -295,7 +295,7 @@
           <br />
           <hr />
           <el-form :model="printForm">
-            <br />
+            <!-- <br />
             <el-form-item label="门店:">
               <div>{{ printForm.storeName }}</div>
             </el-form-item><br />
@@ -339,18 +339,71 @@
                 <div class="text-left" style="width: 50%;height:30px;">{{item.payName}}</div>
                 <div class="text-left" style="width: 50%;height:30px;">{{item.payMoney}}</div>
               </div>
+            </div> -->
+            <div class="box1">
+              <p class="font-w">门 店：</p> <span>{{ printForm.storeName }}</span>
             </div>
-            <br />
+            <div class="box1">
+              <p class="font-w">日 期：</p><span>{{ printForm.rechargeDate }}</span>
+            </div>
+            <div class="box1">
+              <p class="font-w">单据号：</p><span>{{ printForm.rechargeNum }}</span> 
+            </div>
+            <div class="box1">
+              <p class="font-w">收银员：</p> <span>{{ printForm.inputNum }}</span> 
+            </div>
+            <div class="box1">
+              <p class="font-w">姓 名：</p><span>{{ printForm.memberName }}</span> 
+            </div>
+            <div class="box1">
+              <p class="font-w">手机号：</p><span>{{ printForm.mobilePhone }}</span> 
+            </div>
+            <hr style="margin-top:10px"/>
+            <div class="print-project">
+              <ul>
+                <li class="project-top">
+                  <p>类别</p>
+                  <p>金额</p>
+                  <p>余额</p>
+                </li>
+                <li class="project-top-del">
+                  <p>{{ printForm.rechargeTypeName }}</p>
+                  <p>{{ printForm.collectionCashAmount }}</p>
+                  <p>{{ printForm.afterMoney }}</p>
+                </li>
+              </ul>
+            </div>
+            <hr style="margin-top:10px"/>
+                <div class="print-project">
+                  <ul>
+                    <li class="project-top">
+                      <p>付款方式</p>
+                      <p>金额</p>
+                    </li>
+                    <li v-for="(item,index) in printForm.payLists " :key="index" class="project-top-del">
+                      <p>{{ item.payName }}</p>
+                      <p> {{ item.payMoney }}</p>
+                    </li>
+                  </ul>
+                </div>
             <br />
             <div style="height:50px"></div>
-            <el-form-item label="签名:">
-              <!-- <div style="height:30px;width:150px;border-bottom:1px solid #333"> </div> -->
+            <div class="box1">
+              <p class="font-w">签名：</p>
+            </div>
+            <div class="box1">
+              <p class="font-w">服务热线：</p> <span>{{ printForm.telephone }}</span>
+            </div>
+            <div class="box1">
+              <p class="font-w"></p> <span>{{ printForm.printDate | dateFormat }}</span>
+            </div>
+            <!-- <el-form-item label="签名:">
             </el-form-item><br />
             <el-form-item label="服务热线:">
               {{ printForm.telephone }} </el-form-item><br />
             <el-form-item>
               {{ printForm.printDate | dateFormat }}
-            </el-form-item>
+            </el-form-item> -->
             <br /><br />
           </el-form>
         </div>
@@ -368,13 +421,17 @@
     <updo ref="updo" @recTypeData="recTypeData"></updo>
     <detail ref="detail" @detailData="detailData"></detail>
     <trading ref="trading" :mobilePhone='form.mobilePhone'/>
+    <record-details ref="recordDetails"/>
+    <rechargeDetail ref="rechargeDetail"/>
   </div>
 </template>
 <script>
+import rechargeDetail from './detail.vue'
 import detail from "./components/detail.vue";
 import repayment from "@/components/repayment/index.vue";
 import rectype from "@/components/recharge/type/index";
 import updo from "@/components/recharge/updo/index";
+import recordDetails from './components/record-details.vue'
 import { ctlist, recpage, selectById, editRecAccount } from "@/api/eashier.js";
 import {
   storeMemberOne,
@@ -394,7 +451,6 @@ import staffsles from "@/components/staffList/staff/index";
 import member from "@/components/member/index";
 import selec from "@/components/store/select/index";
 import Template from "../../discount-coupon/issue/components/template.vue";
- 
 export default {
   name:"collectionList",
   components: {
@@ -409,6 +465,8 @@ export default {
     updo,
     detail,
     Template,
+    recordDetails,
+    rechargeDetail,
   },
   data() {
     return {
@@ -1148,14 +1206,14 @@ export default {
           }
         }
       }
-      setTimeout(() => {
-        this.saveloading = false;
-      }, 3000);
+      // setTimeout(() => {
+      //   this.saveloading = false;
+      // }, 3000);
     },
     addrec() {
-      setTimeout(() => {
-        this.saveloading = false;
-      }, 3000);
+      // setTimeout(() => {
+      //   this.saveloading = false;
+      // }, 3000);
       if (this.liftType == 0) {
         this.form.giveType = this.giveType
         this.$confirm('是否发送短信?', '短信', {
@@ -1164,6 +1222,7 @@ export default {
           cancelButtonText: '否'
         }).then(()=>{
           this.form.isSendSms = 1
+          this.saveloading = true
           addrec(this.form).then((res) => {
             this.saveloading = false;
             if (res.code == "000000") {
@@ -1171,6 +1230,7 @@ export default {
               this.$message.success({
                 message: res.message,
               });
+              this.$refs.rechargeDetail.show()
             } else {
               this.$alert(res.message, "提示", {
                 confirmButtonText: "确定",
@@ -1185,6 +1245,7 @@ export default {
           });
         }).catch(()=>{
           this.form.isSendSms = 0
+          this.saveloading = true 
           addrec(this.form).then((res) => {
             this.saveloading = false;
             if (res.code == "000000") {
@@ -1192,6 +1253,7 @@ export default {
               this.$message.success({
                 message: res.message,
               });
+              this.$refs.rechargeDetail.show()
             } else {
               this.$alert(res.message, "提示", {
                 confirmButtonText: "确定",
@@ -1212,6 +1274,7 @@ export default {
           cancelButtonText: '否'
         }).then(()=>{
           this.form.isSendSms = 1
+          this.saveloading = true
           upgrade(this.form).then((res) => {
           this.saveloading = false;
           if (res.code == "000000") {
@@ -1219,6 +1282,7 @@ export default {
             this.$message.success({
               message: res.message,
             });
+            this.$refs.rechargeDetail.show()
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
@@ -1231,6 +1295,7 @@ export default {
         });
         }).catch(()=>{
           this.form.isSendSms = 0
+          this.saveloading = true
           upgrade(this.form).then((res) => {
             this.saveloading = false;
             if (res.code == "000000") {
@@ -1238,6 +1303,7 @@ export default {
               this.$message.success({
                 message: res.message,
               });
+              this.$refs.rechargeDetail.show()
             } else {
               this.$alert(res.message, "提示", {
                 confirmButtonText: "确定",
@@ -1528,6 +1594,28 @@ export default {
 };
 </script>
 <style scoped>
+.print-project{
+  width:100%
+}
+.project-top-del p:nth-child(1){
+  width:110px;
+}
+.project-top-del p{
+  display:inline-block;
+  width:40px
+}
+.project-top p{
+  /* font-weight: bold; */
+  display:inline-block;
+  width:40px
+}
+.project-top p:nth-child(1){
+  width:110px;
+}
+.font-w{
+  /* font-weight: bold; */
+  display:inline-block;
+}
 ::v-deep .el-input__inner{
   height: 38px;
 }
@@ -1620,8 +1708,9 @@ export default {
   padding: 0 5px 0 0;
 }
 .printDiv {
-  width: 180px;
+  width: 280px;
   margin: 0 auto;
+  color:#000000
 }
 /*去除页眉页脚*/
 @page {
diff --git a/src/pages/eashier/collectionList/components/record-details.vue b/src/pages/eashier/collectionList/components/record-details.vue
new file mode 100644
index 0000000..0c1ed45
--- /dev/null
+++ b/src/pages/eashier/collectionList/components/record-details.vue
@@ -0,0 +1,109 @@
+<template>
+    <el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="detailDialog" width="40%" append-to-body :before-close="handleClose">
+        <el-descriptions  :column="3" size="medium" border>
+            <el-descriptions-item label="门店">{{ form.storeName  }}</el-descriptions-item>
+            <el-descriptions-item label="日期">{{ form.rechargeDate }}</el-descriptions-item>
+            <el-descriptions-item label="单据号">{{ form.rechargeNum  }}</el-descriptions-item>
+            <el-descriptions-item label="收银员">{{ form.inputNum }}</el-descriptions-item>
+            <el-descriptions-item label="姓名">{{ form.memberName }}</el-descriptions-item>
+            <el-descriptions-item label="手机号">{{ form.mobilePhone }}</el-descriptions-item>
+        </el-descriptions>
+        <div class="card">
+            <div class="card-detail">
+                <p v-for="(item,index) in card" :key="index">{{ item }}</p>
+            </div>
+            <div class="card-detail-special">
+                <p style="width: 48.5%;">{{ form.rechargeTypeName }}</p>
+                <p style="width: 46.5%;">{{ form.collectionCashAmount }}</p>
+                <p>{{ form.afterMoney }}</p>
+            </div>
+        </div>
+        <div class="card">
+            <div class="card-detail">
+                <p v-for="(item,index) in payList" :key="index">{{ item }}</p>
+            </div>
+            <div class="card-detail" v-for="item in form.payLists">
+                <p>{{ item.payName }}</p>
+                <p>{{ item.payMoney }}</p>
+            </div>
+        </div>
+        <span  slot="footer" class="dialog-footer">
+        <el-button size="mini" type="primary" plain @click="cancel">取 消</el-button>
+      </span>
+    </el-dialog>
+  </template>
+  
+  <script>
+  import { recpage } from "@/api/eashier.js";
+  export default {
+    data() {
+      return {
+        detailDialog: false,
+        title: "充值记录单",
+        form: {},
+        card:['类别','金额','余额'],
+        payList:['付款方式','金额'],
+      };
+    },
+    methods:{
+        cancel() {
+          this.detailDialog = false;
+          this.form = Object.assign({});
+        },
+        handleClose(){
+            this.detailDialog = false;
+            this.form = Object.assign({});
+        },
+        init(){
+            let params = {
+                pageNum:1,
+                pageSize:10,
+                selectDate:this.formatTime(new Date(), "YYYYMM")
+            }
+            recpage(params).then(res=>{
+                if(res.code = '000000'){
+                    this.detailDialog = true
+                    if(res.pageInfo.list.length){
+                        this.form = res.pageInfo.list[0]
+                        this.list = [{
+                            rechargeTypeName:this.form.rechargeTypeName,
+                            collectionCashAmount:this.form.collectionCashAmount,
+                            afterMoney:this.form.afterMoney
+                        }]
+                    }
+                }
+            })
+        }
+    }
+  };
+  </script>
+  
+<style scoped>
+.el-descriptions--medium.is-bordered .el-descriptions-item__cell{
+    width: 100px;
+}
+.card{
+    margin-top: 10px;
+    padding: 10px;
+    box-sizing: border-box;
+    width: 100%;
+    -webkit-box-shadow: 3px 3px 10px #888888;
+    box-shadow: 3px 3px 10px #888888;
+}
+.card-detail{
+    display: flex;
+    margin-bottom: 5px;
+    align-items: center;
+    justify-content: space-between;
+}
+.card-detail-special{
+    display: flex;
+}
+.card-detail-special p:nth-last-child(1){
+    text-align: right;
+}
+.card-detail:nth-child(1){
+    font-weight: 700;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/pages/eashier/collectionList/detail.vue b/src/pages/eashier/collectionList/detail.vue
new file mode 100644
index 0000000..e1d3ccd
--- /dev/null
+++ b/src/pages/eashier/collectionList/detail.vue
@@ -0,0 +1,242 @@
+<template>
+ <el-dialog :close-on-click-modal="false" v-dialogDrag title="详情" :visible.sync="printDialogVisible" width="30%">
+        <div id="printTest" class="printDiv">
+          <div class="text-center">
+            充值
+          </div>
+          <br />
+          <hr />
+          <el-form :model="printForm">
+
+            <div class="box1">
+              <p class="font-w">门 店：</p> <span>{{ printForm.storeName }}</span>
+            </div>
+            <div class="box1">
+              <p class="font-w">日 期</p><span>{{ printForm.rechargeDate }}</span>
+            </div>
+            <div class="box1">
+              <p class="font-w">单据号：</p><span>{{ printForm.rechargeNum }}</span> 
+            </div>
+            <div class="box1">
+              <p class="font-w">收银员：</p> <span>{{ printForm.inputNum }}</span> 
+            </div>
+            <div class="box1">
+              <p class="font-w">姓 名：</p><span>{{ printForm.memberName }}</span> 
+            </div>
+            <div class="box1">
+              <p class="font-w">手机号：</p><span>{{ printForm.mobilePhone }}</span> 
+            </div>
+            <hr style="margin-top:10px"/>
+            <div class="print-project">
+              <ul>
+                <li class="project-top">
+                  <p>类别</p>
+                  <p>金额</p>
+                  <p>余额</p>
+                </li>
+                <li class="project-top-del">
+                  <p>{{ printForm.rechargeTypeName }}</p>
+                  <p>{{ printForm.collectionCashAmount }}</p>
+                  <p>{{ printForm.afterMoney }}</p>
+                </li>
+              </ul>
+            </div>
+            <hr style="margin-top:10px"/>
+                <div class="print-project">
+                  <ul>
+                    <li class="project-top">
+                      <p>付款方式</p>
+                      <p>金额</p>
+                    </li>
+                    <li v-for="(item,index) in printForm.payLists " :key="index" class="project-top-del">
+                      <p>{{ item.payName }}</p>
+                      <p> {{ item.payMoney }}</p>
+                    </li>
+                  </ul>
+                </div>
+            <br />
+            <div style="height:50px"></div>
+          </el-form>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="mini" type="primary" plain @click="printDialogVisible = false">取 消</el-button>
+        </span>
+      </el-dialog>
+</template>
+
+<script>
+import { recpage} from "@/api/eashier.js";
+export default {
+  data() {
+    return {
+        printDialogVisible:false,
+        printForm:{},
+        title:"充值开卡"
+    }
+  },
+  methods: {
+    show(){
+        this.printDialogVisible = true
+        this.init()
+    },
+    init(){
+      let params = {
+          pageNum:1,
+          pageSize:10,
+          selectDate:this.formatTime(new Date(), "YYYYMM")
+      }
+      recpage(params).then(res=>{
+          if(res.code = '000000'){
+              this.detailDialog = true
+              if(res.pageInfo.list.length){
+                  this.printForm = res.pageInfo.list[0]
+              }
+          }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.print-project{
+  width:100%
+}
+.project-top-del p:nth-child(1){
+  width:60%;
+}
+.project-top-del p{
+  display:inline-block;
+  width:40px
+}
+.project-top p{
+  font-weight: bold;
+  display:inline-block;
+  width:40px
+}
+.project-top p:nth-child(1){
+  width:60%;
+}
+.font-w{
+  font-weight: bold;
+  display:inline-block;
+}
+::v-deep .el-input__inner{
+  height: 38px;
+}
+.collection {
+  background: white;
+  margin-left: 25px;
+}
+ 
+.collectioncenter {
+  margin-top: 15px;
+  padding-left: 40px;
+}
+ 
+.collectioncenter table {
+  margin: 10px auto;
+}
+ 
+.collectioncenter th:nth-child(1) {
+  min-width: 78px;
+}
+ 
+.collectioncenter td {
+  height: 25px;
+  min-width: 68px;
+  text-align: center;
+  padding: 10px;
+}
+ 
+.collection .span {
+  width: 100px;
+  display: inline-block;
+}
+ 
+.type .el-radio__label {
+  display: none;
+}
+ 
+/* .collection .el-input {
+  width: 100px;
+} */
+.colljisuan {
+  height: 38px;
+  width: 100%;
+  border-bottom: 1px solid #999999;
+  position: relative;
+  font-size: 14px;
+  line-height: 35px;
+}
+ 
+.colljisuan span:nth-child(1) {
+  position: absolute;
+  left: 35px;
+}
+ 
+.colljisuan span:nth-child(2) {
+  position: absolute;
+  left: 235px;
+}
+ 
+.colle {
+  padding: 10px 0px 10px 30px;
+}
+ 
+.colle .el-collapse-item,
+.colle-but {
+  max-width: 1100px;
+}
+ 
+.colle .el-collapse-item__header {
+  border-bottom: 1px solid #999999;
+}
+.colleInt .el-collapse-item,
+.colle-but {
+  max-width: 1100px;
+}
+ 
+.collection > .el-date-picker__time-header {
+  display: none !important;
+}
+ 
+.printDiv .el-form-item {
+  margin-bottom: 0px;
+}
+ 
+.printDiv .el-form-item__label,
+.el-form-item__content {
+  font-size: 12px;
+  color: black;
+  font-family: "宋体";
+  padding: 0 5px 0 0;
+}
+.printDiv {
+  width: 280px;
+  margin: 0 auto;
+}
+/*去除页眉页脚*/
+@page {
+  size: auto; /* auto is the initial value */
+  margin: 0mm; /* this affects the margin in the printer settings */
+  padding: 0;
+}
+ 
+html {
+  background-color: #ffffff;
+  margin: 0; /* this affects the margin on the html before sending to printer */
+}
+@media print {
+  /*设置要打印的区域*/
+  #tablecontent {
+    display: block;
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+  }
+}
+ 
+/*去除页眉页脚*/
+</style>
\ No newline at end of file
diff --git a/src/pages/eashier/courseAdjust/components/index.vue b/src/pages/eashier/courseAdjust/components/index.vue
index ea37506..38904e3 100644
--- a/src/pages/eashier/courseAdjust/components/index.vue
+++ b/src/pages/eashier/courseAdjust/components/index.vue
@@ -226,7 +226,6 @@ import {
   ctlist,
   selectList,
   storeMemberOne,
-  couAccountList,
   addCardChange,
 } from "@/api/eashier.js";
 import staffratio from "./staffratio";
diff --git a/src/pages/eashier/errorOrder/component/index.vue b/src/pages/eashier/errorOrder/component/index.vue
index db267de..4f06d75 100644
--- a/src/pages/eashier/errorOrder/component/index.vue
+++ b/src/pages/eashier/errorOrder/component/index.vue
@@ -278,6 +278,9 @@ export default {
 }
 </script>
 <style scoped>
+.table{
+  width: 100%;
+}
 .project .el-col {
   width: 450px;
 }
diff --git a/src/pages/eashier/proceeds/detail/printform.vue b/src/pages/eashier/proceeds/detail/printform.vue
index 4dd127e..57b577d 100644
--- a/src/pages/eashier/proceeds/detail/printform.vue
+++ b/src/pages/eashier/proceeds/detail/printform.vue
@@ -19,10 +19,6 @@
         <br />
         <hr class="text-gray">
         <div style="height:8px"></div>
-        <!-- <el-table :data="printForm.projectList" style="wdith: 180px">
-          <el-table-column align="left" prop="projectName" label="项目"></el-table-column>
-          <el-table-column align="center" prop="transactionPrice" label="价格"></el-table-column>
-        </el-table> -->
         <div class="print-table" v-for="(item,index) in printForm.projectList">
           <div>
             <span>项目: <span class="text-cyan">{{item.projectName}}</span></span>
@@ -36,27 +32,6 @@
           <div style="height:8px"></div>
           <hr class="text-gray">
         </div>
-        <!-- <el-form-item label="卡付:">
-          <div class="form-width-sm">
-            {{ printForm.collectionRechargeAmount }}
-          </div>
-        </el-form-item>
-        <el-form-item label="现付:">
-          <div style="width: 40px">
-            {{ printForm.collectionCashAmount }}
-          </div>
-        </el-form-item>
-        <br />
-        <el-form-item label="卡包:">
-          <div class="form-width-sm">
-            <span v-if="printForm.courseAccountId != null">{{
-                    printForm.projectName
-                  }}</span>
-          </div>
-        </el-form-item>
-        <el-form-item label="实付:">
-          <div>{{ printForm.numPayMoney }}</div>
-        </el-form-item> -->
         <br />
         <br />
         <el-form-item label="签名:">
diff --git a/src/pages/eashier/reatment/components/record-details.vue b/src/pages/eashier/reatment/components/record-details.vue
new file mode 100644
index 0000000..f0aee56
--- /dev/null
+++ b/src/pages/eashier/reatment/components/record-details.vue
@@ -0,0 +1,129 @@
+<template>
+    <el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="detailDialog" width="40%" append-to-body :before-close="handleClose">
+        <el-descriptions  :column="3" size="medium" border>
+            <el-descriptions-item label="门店">{{ form.storeName  }}</el-descriptions-item>
+            <el-descriptions-item label="日期">{{ form.date }}</el-descriptions-item>
+            <el-descriptions-item label="单据号">{{ form.courseReatmentNum  }}</el-descriptions-item>
+            <el-descriptions-item label="收银员">{{ form.inputNum }}</el-descriptions-item>
+            <el-descriptions-item label="姓名">{{ form.memberName }}</el-descriptions-item>
+            <el-descriptions-item label="手机号">{{ form.mobilePhone }}</el-descriptions-item>
+        </el-descriptions>
+        <div class="card">
+            <div class="card-detail">
+                <p v-for="(item,index) in card" :key="index">{{ item }}</p>
+            </div>
+            <div class="card-detail-special" v-for="item in form.courseLists" :key="item.id">
+                <p style="width: 48.5%;">{{ item.projectName }}</p>
+                <p style="width: 46.5%;">{{ item.amount }}</p>
+                <p>{{ item.numberTimes }}</p>
+            </div>
+        </div>
+        <div class="card">
+            <div class="card-detail">
+                <p v-for="(item,index) in payList" :key="index">{{ item }}</p>
+            </div>
+            <div class="card-detail" v-for="item in form.payLists">
+                <p>{{ item.payName }}</p>
+                <p>{{ item.payMoney }}</p>
+            </div>
+        </div>
+        <span  slot="footer" class="dialog-footer">
+        <el-button size="mini" type="primary" plain @click="cancel">取 消</el-button>
+      </span>
+    </el-dialog>
+  </template>
+  
+  <script>
+  import { coursepage,selectCourseOne } from "@/api/eashier.js";
+  export default {
+    data() {
+      return {
+        detailDialog: false,
+        title: "疗程记录单",
+        form: {},
+        card:['项目','金额','次数'],
+        payList:['付款方式','金额'],
+      };
+    },
+    created(){
+        // this.init()
+    },
+    methods:{
+        cancel() {
+          this.detailDialog = false;
+          this.form = Object.assign({});
+        },
+        handleClose(){
+            this.detailDialog = false;
+            this.form = Object.assign({});
+        },
+        getDetail(form){
+            let params = {
+                docId:form.courseReatmentNum,
+                date:form.date
+            }
+            selectCourseOne(params).then(res=>{
+                if(res.code == '000000'){
+                    this.form.courseLists = res.data.courseLists
+                    let list = []
+                    res.data.rechargeConsumeList.forEach(item=>{
+                        let index = list.findIndex( items=>items.id == item.id  )
+                        if( index == -1 ){
+                            list.push(item)
+                        }else{
+                            list[index].spendMoney += item.spendMoney
+                        }
+                    })
+                    this.form.payLists = res.data.payLists.concat(list.map(item=>{return {payName:item.rechargeTypeName,payMoney:item.spendMoney }}))
+                }
+            })
+            this.detailDialog = true
+        },
+        init(){
+            let params = {
+                pageNum: 1, 
+                pageSize: 10,
+            }
+            params.selectDate = this.formatTime(new Date(), "YYYYMM");
+            coursepage(params).then(res=>{
+                if( res.code == '000000' ){
+                    if(res.pageInfo.list.length){
+                         this.form = res.pageInfo.list[0]
+                         this.getDetail(this.form)
+                    }
+                }
+            })
+        }
+    }
+  };
+  </script>
+  
+<style scoped>
+.el-descriptions--medium.is-bordered .el-descriptions-item__cell{
+    width: 100px;
+}
+.card{
+    margin-top: 10px;
+    padding: 10px;
+    box-sizing: border-box;
+    width: 100%;
+    -webkit-box-shadow: 3px 3px 10px #888888;
+    box-shadow: 3px 3px 10px #888888;
+}
+.card-detail{
+    display: flex;
+    margin-bottom: 5px;
+    align-items: center;
+    justify-content: space-between;
+}
+.card-detail-special{
+    display: flex;
+}
+.card-detail-special p:nth-last-child(1){
+    text-align: right;
+}
+.card-detail:nth-child(1){
+    font-weight: 700;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/pages/eashier/reatment/detail.vue b/src/pages/eashier/reatment/detail.vue
new file mode 100644
index 0000000..f9a19fb
--- /dev/null
+++ b/src/pages/eashier/reatment/detail.vue
@@ -0,0 +1,261 @@
+<template>
+    <el-dialog :close-on-click-modal="false" v-dialogDrag title="详情" :visible.sync="printDialogVisible" width="30%">
+        <div id="printTest" class="printDiv">
+          <div class="text-center">
+            疗程
+          </div>
+          <br />
+          <hr />
+          <el-form>
+             <div class="box1">
+               <p class="font-w">日 期：</p> <span>{{ printForm.date }}</span>
+             </div>
+             <div class="box1">
+               <p class="font-w">交易号：</p><span>{{ printForm.courseReatmentNum }}</span>
+             </div>
+             <div class="box1">
+               <p class="font-w">门 店：</p><span>{{ printForm.storeName }}</span> 
+             </div>
+             <div class="box1">
+               <p class="font-w">收银员：</p> <span>{{ printForm.inputNum }}</span> 
+             </div>
+             <div class="box1">
+               <p class="font-w">姓 名：</p><span>{{ printForm.memberName }}</span> 
+             </div>
+             <div class="box1">
+               <p class="font-w">手机号：</p><span>{{ printForm.mobilePhone }}</span> 
+             </div>
+             <hr style="margin-top:10px"/>
+             <div class="print-project">
+               <ul>
+                 <li class="project-top">
+                   <p>项目</p>
+                   <p>金额</p>
+                   <p>次数</p>
+                 </li>
+                 <li v-for="(item,index) in courseLists" :key="index" class="project-top-del">
+                   <p>{{ item.projectName }}</p>
+                   <p> {{ item.amount - item.debtMoney }}</p>
+                   <p>{{ item.numberTimes }}</p>
+                 </li>
+               </ul>
+             </div>
+             <hr style="margin-top:10px"/>
+             <div class="print-project">
+               <ul>
+                 <li class="project-top">
+                   <p>付款方式</p>
+                   <p>金额</p>
+                 </li>
+                 <li v-for="(item,index) in payLists" :key="index" class="project-top-del">
+                   <p>{{ item.payName }}</p>
+                   <p> {{ item.payMoney }}</p>
+                 </li>
+               </ul>
+             </div>
+             <div style="height:50px"></div>
+          </el-form>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="mini" type="primary" plain @click="printDialogVisible = false">取 消</el-button>
+        </span>
+    </el-dialog>
+   </template>
+   
+<script>
+import { coursepage,selectCourseOne } from "@/api/eashier.js";
+export default {
+     data() {
+       return {
+           printDialogVisible:false,
+           printForm:{},
+           courseLists:[],
+           payLists:[],
+           title:"疗程开卡"
+       }
+     },
+     methods: {
+       getDetail(){
+        let params = {
+          docId:this.printForm.courseReatmentNum,
+          date:this.printForm.date
+        }
+        selectCourseOne(params).then(res=>{
+            if(res.code == '000000'){
+                this.courseLists = res.data.courseLists
+                let list = []
+                res.data.rechargeConsumeList.forEach(item=>{
+                    let index = list.findIndex( items=>items.rechargeTypeName == item.rechargeTypeName  )
+                    if( index == -1 ){
+                        list.push(item)
+                    }else{
+                        list[index].spendMoney += item.spendMoney
+                    }
+                })
+                list = list.filter(item=>item.spendMoney)
+                this.payLists = res.data.payLists.concat(list.map(item=>{return { payName:item.rechargeTypeName,payMoney:item.spendMoney }}))
+            }
+        })
+       },
+       init(){
+            let params = {
+                pageNum:1,
+                pageSize:10,
+                selectDate:this.formatTime(new Date(), "YYYYMM")
+            }
+            coursepage(params).then(res=>{
+                if(res.code == '000000'){
+                    this.printDialogVisible = true
+                    if(res.pageInfo.list.length){
+                        this.printForm = res.pageInfo.list[0]
+                        this.getDetail()
+                    }
+                }
+            })
+        }
+     },
+   }
+</script>
+<style scoped>
+    .print-project{
+      width:100%
+    }
+    .project-top-del p:nth-child(1){
+      width:60%;
+    }
+    .project-top-del p{
+      display:inline-block;
+      width:40px
+    }
+    .project-top p{
+      font-weight: bold;
+      display:inline-block;
+      width:40px
+    }
+    .project-top p:nth-child(1){
+      width:60%;
+    }
+    .font-w{
+      font-weight: bold;
+      display:inline-block;
+    }
+   ::v-deep .el-input__inner{
+     height: 38px;
+   }
+   .collection {
+     background: white;
+     margin-left: 25px;
+   }
+    
+   .collectioncenter {
+     margin-top: 15px;
+     padding-left: 40px;
+   }
+    
+   .collectioncenter table {
+     margin: 10px auto;
+   }
+    
+   .collectioncenter th:nth-child(1) {
+     min-width: 78px;
+   }
+    
+   .collectioncenter td {
+     height: 25px;
+     min-width: 68px;
+     text-align: center;
+     padding: 10px;
+   }
+    
+   .collection .span {
+     width: 100px;
+     display: inline-block;
+   }
+    
+   .type .el-radio__label {
+     display: none;
+   }
+    
+   /* .collection .el-input {
+     width: 100px;
+   } */
+   .colljisuan {
+     height: 38px;
+     width: 100%;
+     border-bottom: 1px solid #999999;
+     position: relative;
+     font-size: 14px;
+     line-height: 35px;
+   }
+    
+   .colljisuan span:nth-child(1) {
+     position: absolute;
+     left: 35px;
+   }
+    
+   .colljisuan span:nth-child(2) {
+     position: absolute;
+     left: 235px;
+   }
+    
+   .colle {
+     padding: 10px 0px 10px 30px;
+   }
+    
+   .colle .el-collapse-item,
+   .colle-but {
+     max-width: 1100px;
+   }
+    
+   .colle .el-collapse-item__header {
+     border-bottom: 1px solid #999999;
+   }
+   .colleInt .el-collapse-item,
+   .colle-but {
+     max-width: 1100px;
+   }
+    
+   .collection > .el-date-picker__time-header {
+     display: none !important;
+   }
+    
+   .printDiv .el-form-item {
+     margin-bottom: 0px;
+   }
+    
+   .printDiv .el-form-item__label,
+   .el-form-item__content {
+     font-size: 12px;
+     color: black;
+     font-family: "宋体";
+     padding: 0 5px 0 0;
+   }
+   .printDiv {
+     width: 250px;
+     margin: 0 auto;
+   }
+   /*去除页眉页脚*/
+   @page {
+     size: auto; /* auto is the initial value */
+     margin: 0mm; /* this affects the margin in the printer settings */
+     padding: 0;
+   }
+    
+   html {
+     background-color: #ffffff;
+     margin: 0; /* this affects the margin on the html before sending to printer */
+   }
+   @media print {
+     /*设置要打印的区域*/
+     #tablecontent {
+       display: block;
+       width: 100%;
+       height: auto;
+       overflow: hidden;
+       margin: 0;
+       padding: 0;
+     }
+   }
+    
+   /*去除页眉页脚*/
+</style>
\ No newline at end of file
diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue
index 9e5b80b..b2e34ba 100644
--- a/src/pages/eashier/reatment/reatment.vue
+++ b/src/pages/eashier/reatment/reatment.vue
@@ -41,84 +41,7 @@
         <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 ">
-            <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>
-            </el-input>
-          </div>
-        </el-form-item>
-        <el-form-item label="疗程名称:">
-          <div class="form-width-ms text-cut">
-            <span>{{ form.projectName }}</span>
-          </div>
-        </el-form-item>
-        <el-form-item label="单次标价:">
-          <div class="form-width-xs">
-            <span class="text-red text-price">{{ form.priceMember?form.priceMember:0 }}</span>
-          </div>
-        </el-form-item>
-        <el-form-item label="成交单价:">
-          <div class="form-width-ms pointer flex">
-            <div >
-              <span class="text-red text-price">{{ form.salesPrice?form.salesPrice:0 }}</span>
-            </div>
-          </div>
-        </el-form-item>
-        <br />
-        <el-form-item label="最少购买:">
-          <div class="form-width-xs">
-            <span>{{ form.minumumTimes }} (次)</span>
-          </div>
-        </el-form-item>
-        <el-form-item label="购买次数:">
-          <div class="form-width-xs pointer">
-            <div v-if="!buysShow" @click="(buysShow = true)">
-              <span class="text-cyan">{{ form.numberTimes?form.numberTimes:0 }}</span>
-              <i v-if="form.numberTimes" class="el-icon-edit text-cyan"></i>
-            </div>
-            <el-input v-focus class="form-input-wdith" v-else size="samll" type="number" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" v-model="form.numberTimes" @change="numbertimes" @blur="numbertimes" ref="buyinput"></el-input>
-          </div>
-        </el-form-item>
-        <el-form-item label="成交金额:">
-          <div class="form-width-xl" v-if="!menberShow" @click="(menberShow = true)">
-            <span class="text-price text-red">{{ form.amount?form.amount:0 }}</span>
-            <i v-if="form.amount" 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.amount" @change="changeDeal" @blur="changeDeal" ref="priceinput"></el-input>
-        </el-form-item>
-        <el-form-item label="待付金额:">
-          <div class="form-width-xl padding-rigth-xs" style="width:120px">
-            <span class="text-cyan text-price">{{ treatAmount }}</span>
-          </div>
-        </el-form-item> -->
-         <!-- {{ form.courseReatmentAmount }} -->
-        <!-- <el-form-item label="实付金额:">
-          <div class="text-red text-price">
-           
-            {{ paidAmount }}
-          </div>
-        </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 }}
-            </el-checkbox>
-            <div v-show="form.integralCheckbox" style="color: red; display: inline-block">
-              | 可用积分:
-              <span>{{ form.consumeIntegral }}</span>
-              | 可兑换金额:<span class="text-price">{{ form.integralMoney }}</span>
-            </div>
-          </div>
-        </el-form-item>
-        <el-form-item label="说明:" v-show="sessionStorageData.course">
-        </el-form-item>
-        <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-form>
+        <br /></el-form>
       <el-table 
         :data="list"           
         :header-cell-style="{
@@ -184,11 +107,6 @@
            <el-input class="form-input-wdith"  v-on:input="scope.row.amount = scope.row.amount.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')" v-focus v-else size="samll" 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
@@ -230,11 +148,6 @@
             {{ 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" prop="debtMoney" label="欠款金额" min-width="100">
           <template slot-scope="scope">
             {{scope.row.debtMoney?scope.row.debtMoney.toFixed(2)*1:0}}
@@ -282,23 +195,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">
-            <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>
       <div class="reatmen">
         <!-- 保存列表弹窗 -->
         <el-dialog :close-on-click-modal="false" v-dialogDrag title="疗程" :visible.sync="listDialogVisible" width="90%" :close="close">
@@ -421,7 +318,7 @@
               <hr />
               <br />
               <el-form :model="printForm">
-                <el-form-item label="门店:">
+                <!-- <el-form-item label="门店:">
                   <div>
                     {{ printForm.storeName }}
                   </div>
@@ -446,20 +343,73 @@
                   <div style="min-width: 64px; display: inline-block">
                     {{ printForm.projectName }} <span class="text-cyan"></span>
                   </div>
-                </el-form-item><br />
-                <el-form-item label="成交:">
-                  <div>¥ {{ printForm.salesPrice }} * {{ printForm.numberTimes }} = ¥ {{ printForm.amount }}</div>
-                </el-form-item><br />
-                <el-table v-if="printForm.collectionRechargeAmount!=0" :data="printForm.rechargeConsumeList" style="width: 180px;">
-                  <el-table-column align="left" prop="rechargeTypeName" label="充值卡" min-width="100"></el-table-column>
-                  <el-table-column align="center" prop="spendMoney" label="支付" width="40"></el-table-column>
-                  <el-table-column align="center" prop="cardConsumeMoney" label="剩余" width="40"></el-table-column>
+                </el-form-item><br /> -->
+                <!-- <el-table :data="printForm.courseLists" style="width: 200px;" show-summary>
+                  <el-table-column align="center" prop="projectName" label="项目" min-width="100px"></el-table-column>
+                  <el-table-column align="center" prop="courseReatmentAmount" label="实付金额" min-width="60">
+                    <template slot-scope="scope">
+                      {{ scope.row.amount - scope.row.debtMoney }}
+                    </template>  
+                  </el-table-column>
+                  <el-table-column align="center" prop="numberTimes" label="次数" min-width="40px"> </el-table-column>
                 </el-table>
-                <el-table v-if="printForm.collectionCashAmount!=0" :data="printForm.payLists" style="width: 180px;">
-                  <el-table-column align="left" prop="payName" label="付款方式" width="100"></el-table-column>
-                  <el-table-column align="center" prop="payMoney" label="支付" width="80"></el-table-column>
+                <hr />
+                <el-table :data="printForm.rechargeConsumeList" style="width: 200px;" show-summary>
+                  <el-table-column align="left" prop="rechargeTypeName" label="充值卡" min-width="100px"></el-table-column>
+                  <el-table-column align="center" prop="spendMoney" label="支付" min-width="50px"></el-table-column>
+                  <el-table-column align="center" prop="cardConsumeMoney" label="剩余" min-width="50px"></el-table-column>
                 </el-table>
-                <br />
+                <hr />
+                <el-table :data="payTypeLists" style="width: 200px;">
+                  <el-table-column align="left" prop="payName" label="付款方式" ></el-table-column>
+                  <el-table-column align="center" prop="payMoney" label="支付" width="80"></el-table-column>
+                </el-table> -->
+                <div class="box1">
+                  <p class="font-w">日 期：</p> <span>{{ printForm.date }}</span>
+                </div>
+                <div class="box1">
+                  <p class="font-w">交易号：</p><span>{{ printForm.courseReatmentNum }}</span>
+                </div>
+                <div class="box1">
+                  <p class="font-w">门 店：</p><span>{{ printForm.storeName }}</span> 
+                </div>
+                <div class="box1">
+                  <p class="font-w">收银员：</p> <span>{{ printForm.inputNum }}</span> 
+                </div>
+                <div class="box1">
+                  <p class="font-w">姓 名：</p><span>{{ printForm.memberName }}</span> 
+                </div>
+                <div class="box1">
+                  <p class="font-w">手机号：</p><span>{{ printForm.mobilePhone }}</span> 
+                </div>
+                <hr style="margin-top:10px"/>
+                <div class="print-project">
+                  <ul>
+                    <li class="project-top">
+                      <p>项目</p>
+                      <p>金额</p>
+                      <p>次数</p>
+                    </li>
+                    <li v-for="(item,index) in courseProjectLists" :key="index" class="project-top-del">
+                      <p>{{ item.projectName }}</p>
+                      <p> {{ item.amount - item.debtMoney }}</p>
+                      <p>{{ item.numberTimes }}</p>
+                    </li>
+                  </ul>
+                </div>
+                <hr style="margin-top:10px"/>
+                <div class="print-project">
+                  <ul>
+                    <li class="project-top">
+                      <p>付款方式</p>
+                      <p>金额</p>
+                    </li>
+                    <li v-for="(item,index) in payTypeLists" :key="index" class="project-top-del">
+                      <p>{{ item.payName }}</p>
+                      <p> {{ item.payMoney }}</p>
+                    </li>
+                  </ul>
+                </div>
                 <div style="height:50px"></div>
                 <el-form-item label="签名:">
                 </el-form-item><br />
@@ -497,6 +447,8 @@
     <project ref="project" @projectData="proConfirm"></project>
     <detail ref="detail" @detailData="detailData"></detail>
     <trading ref="trading" :mobilePhone='form.mobilePhone'/>
+    <record-details ref="recordDetails" />
+    <record-detail ref="recordDetail"/>
   </div>
 </template>
 <script>
@@ -510,6 +462,7 @@ import {
   addcourse,
   ctlist,
   editCouAccount,
+  selectCourseOne
 } from "@/api/eashier.js";
 import { propage } from "@/api/storeManage";
 import repayment from "@/components/repayment/index.vue";
@@ -522,6 +475,8 @@ import admin from "@/components/staffList/admin/index";
 import manager from "@/components/staffList/manager/index";
 import staffsles from "@/components/staffList/staff/index";
 import selec from "@/components/store/select/index";
+import recordDetails from './components/record-details.vue'
+import recordDetail from './detail.vue'
 export default {
   name:"reatment",
   components: {
@@ -535,9 +490,14 @@ export default {
     project,
     detail,
     selec,
+    recordDetails,
+    recordDetail
   },
   data() {
     return {
+      courseProjectLists:[],
+      payTypeLists:[],
+      courseLists:[],
       isShow:false,
       list:[],
       selectIndex:0,
@@ -1399,10 +1359,10 @@ export default {
           this.list[this.selectIndex].collectionCashAmount +
           this.collectionRechargeAmounts +
           this.list[this.selectIndex].collectionIntegralAmount;
-
         this.list.push({})
         this.list.pop()
-        this.addList()
+        let index = this.list.findIndex(item=>!item.projctId)
+        if(index != -1)this.addList()
       }
     },
     openCard(row, $index) {
@@ -1630,6 +1590,7 @@ export default {
               this.$message.success({
                 message: res.message,
               });
+              this.$refs.recordDetail.init()
             } else {
               this.$alert(res.message, "提示", {
                 confirmButtonText: "确定",
@@ -1655,6 +1616,7 @@ export default {
               this.$message.success({
                 message: res.message,
               });
+              this.$refs.recordDetail.init()
             } else {
               this.$alert(res.message, "提示", {
                 confirmButtonText: "确定",
@@ -1770,7 +1732,31 @@ export default {
       row.telephone = JSON.parse(sessionStorage.getItem("storeInfo")).telephone;
       row.printDate = new Date();
       this.printForm = row;
+      this.getDetail()
     },
+    getDetail(){
+        let params = {
+          docId:this.printForm.courseReatmentNum,
+          date:this.printForm.date
+        }
+        selectCourseOne(params).then(res=>{
+            if(res.code == '000000'){
+                this.printForm.rechargeConsumeList = res.data.rechargeConsumeList
+                this.courseProjectLists = res.data.courseLists
+                let list = []
+                res.data.rechargeConsumeList.forEach(item=>{
+                    let index = list.findIndex( items=>items.rechargeTypeName == item.rechargeTypeName  )
+                    if( index == -1 ){
+                        list.push(item)
+                    }else{
+                        list[index].spendMoney += item.spendMoney
+                    }
+                })
+                list = list.filter(item=>item.spendMoney)
+                this.payTypeLists = res.data.payLists.concat(list.map(item=>{return {payName:item.rechargeTypeName,payMoney:item.spendMoney }}))
+            }
+        })
+       },
     propage() {
       var page = {
         pageNum: this.pageInfos.pageNum,
@@ -2039,6 +2025,26 @@ export default {
 };
 </script>
 <style scoped>
+.print-project{
+  width:100%
+}
+.project-top-del p:nth-child(1){
+  width:110px;
+}
+.project-top-del p{
+  display:inline-block;
+  width:45px
+}
+.project-top p{
+  display:inline-block;
+  width:45px
+}
+.project-top p:nth-child(1){
+  width:110px;
+}
+.font-w{
+  display:inline-block;
+}
 .form-width-ms{
   width: 0.8rem !important;
   z-index: 999999999 !important;
@@ -2150,8 +2156,12 @@ export default {
   padding: 0 5px 0 0;
 }
 .printDiv {
-  width: 180px;
+  width: 280px;
   margin: 0 auto;
+  /* font-size:12px; */
+  /* font-family: "宋体"; */
+  color:#000000
+  /* color: black; */
 }
 .marginAuto{
   margin-right: 10px;
diff --git a/src/pages/eashier/service/detail/printform.vue b/src/pages/eashier/service/detail/printform.vue
index 6ac551d..a8207d1 100644
--- a/src/pages/eashier/service/detail/printform.vue
+++ b/src/pages/eashier/service/detail/printform.vue
@@ -8,101 +8,84 @@
       <hr>
       <br>
       <el-form :model="printForm">
-        <el-form-item label="日期:"> {{ printForm.cashDate }} </el-form-item><br>
-        <el-form-item label="交易号:">{{ printForm.cashNum }} </el-form-item><br>
-        <el-form-item label="门店:"> {{ printForm.storeName }} </el-form-item><br>
-        <el-form-item label="顾客:">
-          {{ printForm.memberName ? printForm.memberName : '散客' }}/{{ printForm.mobilePhone ? (printForm.mobilePhone.substring(3, 0)) + '****' + (printForm.mobilePhone.substring(7)) : '******'
-          }}
-        </el-form-item><br>
-        <el-form-item label="收银员:">
-          <div>{{ printForm.inputNum }} </div>
-        </el-form-item>
-        <br />
-        <hr class="text-grey">
-        <div style="height:8px"></div>
-        <!-- <el-table :data="printForm.projectList" style="wdith: 180px">
-          <el-table-column align="left" prop="projectName" label="项目"></el-table-column>
-          <el-table-column align="center" prop="transactionPrice" label="价格"></el-table-column>
-        </el-table> -->
-        <div class="print-table flex justify-center align-center" style="justify-content:space-around">
-          <div class="text-left" style="width:35%">项目 </div>
-          <div class="text-left" style="width:25%">次数 </div>
-          <div class="text-left" style="width:25%" v-if="printForm.isCoursePay">剩余次数 </div>
-          <!-- <div class="text-left" style="width:25%">标价 </div>
-          <div class="text-left" style="width:25%">折后 </div> -->
+        <div class="box1">
+          <p class="font-w">日 期:</p> <span>{{ printForm.cashDate }}</span>
         </div>
-        <div style="height:15px"></div>
-        <div class="print-table flex justify-center align-center" v-for="(item, index) in printForm.projectList" :key="index" style="justify-content:space-around">
-          <div class="text-left" style="width:35%"> <span class="text-cyan text-out">{{ item.projectName }}</span></div>
-          <div class="text-left" style="width:25%"> <span class="text-cyan text-out">1</span></div>
-          <div class="text-left" style="width:25%" v-if="printForm.isCoursePay"> <span class="text-cyan text-out">{{ item.courseRestCount }}</span></div>
-          <!-- <div class="text-left" style="width:25%"> <span class="text-red text-price">{{ item.amount }}</span></div>
-          <div class="text-left" style="width:25%"> <span class="text-red text-price">{{ item.discountmoney }}</span></div> -->
+        <div class="box1">
+          <p class="font-w">交易号:</p><span>{{ printForm.cashNum }}</span>
         </div>
-        <br />
-        <hr class="text-grey">
-        <div style="height:8px"></div>
-        <div v-if="printForm.payLists.length != 0">
-          <div class="print-table flex justify-center align-center"  style="justify-content:space-around">
-            <div class="text-left" style="width:35%">支付方式 </div>
-            <div class="text-left" style="width:25%">支付 </div>
-            <!-- <div class="text-left" style="width:25%"> </div> -->
-          </div>
-          <div style="height:15px"></div>
-          <div class="print-table flex justify-center align-center" v-for="(item, index) in printForm.payLists" :key="index"  style="justify-content:space-around">
-            <div class="text-left" style="width:35%"> <span class="text-cyan text-out">{{ item.payName }}</span></div>
-            <div class="text-left" style="width:25%"> <span class="text-red text-price">{{ item.payMoney }}</span></div>
-            <!-- <div class="text-left" style="width:25%"> <span></span></div> -->
-          </div>
-          <!-- <hr class="text-grey"> -->
+        <div class="box1">
+          <p class="font-w">门 店:</p><span>{{ printForm.storeName }}</span> 
         </div>
-        <div style="height:8px"></div>
-        <hr class="text-grey">
-        <div style="height:8px"></div>
-        <div v-if="recList.length != 0">
-          <div class="print-table flex justify-center align-center"  style="justify-content:space-between">
-            <div class="text-left" >充值帐户 </div>
-            <div class="text-left">充值支付</div>
-            <div class="text-left">赠送金额</div>
-            <div class="text-left">剩余 </div>
-          </div>
-          <div style="height:15px"></div>
-          <div class="print-table flex justify-center align-center" v-for="(item, index) in recList" :key="index"  style="justify-content:space-between">
-            <div class="text-left" > <span class="text-cyan text-out">{{ item.rechargeTypeName }}</span></div>
-            <div class="text-left"> <span class="text-red text-price">{{ item.spendMoney }}</span></div>
-            <div class="text-left"> <span class="text-red text-price">{{ item.accountGiftSpendMoney}}</span></div>
-            <div class="text-left"> <span class="text-red text-price">{{ item.cardRestMoney }}</span>
-            </div>
-          </div>
-          
+        <div class="box1">
+          <p class="font-w">顾 客:</p> <span>{{ printForm.memberName }}</span> 
+        </div>
+        <div class="box1">
+          <p class="font-w">手机号:</p><span>{{ printForm.mobilePhone }}</span> 
+        </div>
+        <div class="box1">
+          <p class="font-w">收银员:</p><span>{{ printForm.inputNum }}</span> 
+        </div>
+        <div class="print-project" v-if="courseList.length">
+          <hr style="margin-top:10px"/>
+          <ul>
+            <li class="project-top">
+              <p>疗程</p>
+              <p>消费次数</p>
+              <p>剩余次数</p>
+            </li>
+            <li class="project-top-del" v-for="(item,index) in courseList" :key="index">
+              <p>{{ item.projectName }}</p>
+              <p>1</p>
+              <p>{{ item.courseRestCount }}</p>
+            </li>
+          </ul>
+        </div>
+        <div class="print-project" v-if="projectList.length">
+          <hr style="margin-top:10px"/>
+          <ul>
+            <li class="project-top">
+              <p>项目</p>
+              <p style="width:33px">标价</p>
+              <p style="width:33px">数量</p>
+              <p style="width:48px">折后价</p>
+            </li>
+            <li v-for="(item,index) in projectList" :key="index" class="project-top-del">
+              <p>{{ item.projectName }}</p>
+              <p style="width:32px"> {{ item.transactionPrice }}</p>
+              <p style="width:32px"> {{ item.number }}</p>
+              <p style="width:48px"> {{ item.price }}</p>
+            </li>
+          </ul>
+        </div>
+        <div class="print-project" v-if="printForm.payLists.length">
+          <hr style="margin-top:10px"/>
+          <ul>
+            <li class="project-top">
+              <p>支付方式</p>
+              <p>支付</p>
+            </li>
+            <li v-for="(item, index) in printForm.payLists" :key="index" class="project-top-del">
+              <p>{{ item.payName }}</p>
+              <p> {{ item.payMoney }}</p>
+            </li>
+          </ul>
+        </div>
+        <div class="print-project"  v-if="recList.length">
+          <hr style="margin-top:10px"/>
+          <ul>
+            <li class="project-top">
+              <p>充值账户</p>
+              <p>本次支付</p>
+              <p>余额</p>
+            </li>
+            <li  v-for="(item, index) in recList" :key="index" class="project-top-del">
+              <p>{{ item.rechargeTypeName }}</p>
+              <p> {{ item.spendMoney }}</p>
+              <p> {{ item.cardRestMoney }}</p>
+            </li>
+          </ul>
         </div>
-        <!-- <div class="flex justify-start align-center  padding-top-xs padding-bottom-xs">
-            <div style="width:33%">卡付: <span class="text-red text-price">{{item.collectionRechargeAmount}}</span></div>
-            <div style="width:33%">现付: <span class="text-red text-price">{{item.collectionCashAmount}}</span></div>
-            <div style="width:33%">疗程付: <span class="text-red text-price" v-if="item.courseAccountId!=null">{{item.transactionPrice}}</span><span class="text-red text-price" v-else>0</span></div>
-          </div> -->
-        <!-- <el-form-item label="卡付:">
-          <div class="form-width-sm">
-            {{ printForm.collectionRechargeAmount }}
-          </div>
-        </el-form-item>
-        <el-form-item label="现付:">
-          <div style="width: 40px">
-            {{ printForm.collectionCashAmount }}
-          </div>
-        </el-form-item>
-        <br />
-        <el-form-item label="卡包:">
-          <div class="form-width-sm">
-            <span v-if="printForm.courseAccountId != null">{{
-                    printForm.projectName
-                  }}</span>
-          </div>
-        </el-form-item>
-        <el-form-item label="实付:">
-          <div>{{ printForm.numPayMoney }}</div>
-        </el-form-item> -->
         <br/>
         <br/>
         <el-form-item label="签名:">
@@ -133,6 +116,8 @@ export default {
       printDialogVisible: false,
       staffName: sessionStorage.getItem("staffName"),
       recList: [],
+      courseList:[],
+      projectList:[]
     };
   },
   methods: {
@@ -148,9 +133,11 @@ export default {
         item.discountmoney = ((item.collectionCashAmount * 1) + (item.collectionRechargeAmount * 1)).toFixed(2) * 1;
       })
       this.recList = recList;
-      
-      console.log(form.projectList)
-      // console.log(this.recList)
+      if(this.printForm.isCoursePay){
+        this.courseList = this.printForm.projectList.filter(item=>item.courseRestCount)
+      }
+      this.projectList = this.printForm.projectList.filter(item=>!item.courseRestCount)
+      console.log(this.courseList,this.projectList)
       this.printDialogVisible = true;
     },
   },
@@ -158,6 +145,26 @@ export default {
 </script>
 
 <style scoped>
+.print-project{
+  width:100%
+}
+.project-top-del p:nth-child(1){
+  width:90px;
+}
+.project-top-del p{
+  display:inline-block;
+  width:65px
+}
+.project-top p{
+  display:inline-block;
+  width:65px
+}
+.project-top p:nth-child(1){
+  width:90px;
+}
+.font-w{
+  display:inline-block;
+}
 .printDiv .el-form-item {
   margin-bottom: 0px;
 }
@@ -169,7 +176,7 @@ export default {
 }
 .printDiv .el-form-item__label,
 .el-form-item__content {
-  font-size: 12px;
+  /* font-size: 12px; */
   color: black;
   font-family: "宋体";
   padding: 0 5px 0 0;
@@ -178,6 +185,8 @@ export default {
 .printDiv {
   width: 380px;
   margin: 0 auto;
+  font-size:14px;
+  color:#000000
 }
 
 .printDiv .el-table td,
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index ba57264..6524592 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -259,7 +259,7 @@
                   width="900"
                   @show="openRec(props.row,props.$index)"
                   v-model='props.row.popover'
-                  trigger="hover"
+                  trigger="click"
                 >
                   <div v-if="props.row.courseAccountId == null">
                     <el-table
@@ -1597,6 +1597,7 @@ export default {
         this.list.push({})
         this.list.pop()
       }else{ //先用实充，再用赠送
+          console.log('来了这里---',(row.spendMoney*1) === this.spendMoney)
         if((row.spendMoney*1) === this.spendMoney){ //上一次的值没有改变
           row.cardOvers = (row.cardOvers - row.spendMoney).toFixed(2)*1
           this.updataList()
@@ -3297,6 +3298,7 @@ export default {
   },
   created() {
     this.notData()
+    this.addPro()
   },
   // services
   beforeRouteLeave(to, from, next) {
diff --git a/src/pages/statistics/storeTotalPerformance/index.vue b/src/pages/statistics/storeTotalPerformance/index.vue
index e3438f7..eada96a 100644
--- a/src/pages/statistics/storeTotalPerformance/index.vue
+++ b/src/pages/statistics/storeTotalPerformance/index.vue
@@ -1,18 +1,21 @@
 <template>
     <div>
-            <div class="staffRanking_header padding-bottom-xs">
-              <div></div>
-              <div class="block">
-                <el-date-picker
-                  v-model="Time"
-                  type="date"
-                  placeholder="选择日期"
-                  >
-                </el-date-picker>
-                <el-button size="mini" type="primary" @click="init">查询</el-button>
-                <el-button size="mini" type="primary" @click="exit">导出</el-button>
-              </div>
-            </div>
+      <div class="staffRanking_header padding-bottom-xs">
+        <div></div>
+        <div class="block">
+          <el-date-picker
+            v-model="Time"
+            placeholder="选择日期"
+            type="daterange" 
+            range-separator="至" 
+            start-placeholder="开始日期"
+            end-placeholder="截止日期"
+            >
+          </el-date-picker>
+          <el-button size="mini" type="primary" @click="init">查询</el-button>
+          <el-button size="mini" type="primary" @click="exit">导出</el-button>
+        </div>
+      </div>
       <el-table v-loading="loading" :data="list" :header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee', }" show-summary border max-height="600" ref="table">
         <el-table-column align="center" min-width="80" prop="storeNum" label="门店编码" fixed="left"></el-table-column>
         <el-table-column align="center" min-width="100" prop="storeName" label="门店名称" fixed="left"></el-table-column>
@@ -76,7 +79,7 @@ import { storeByDayDailys,exportStoreByDayDailys } from "@/api/statistics.js";
         loading: false,
         tableDate: [],
         list: [],
-        Time:new Date()
+        Time:[new Date(),new Date()]
       };
     },
     created() {
@@ -90,8 +93,8 @@ import { storeByDayDailys,exportStoreByDayDailys } from "@/api/statistics.js";
           storeId:sessionStorage.getItem("storeId")
         }
         if(this.Time!=null){
-          params.startTime = this.formatTime(this.Time, "YYYY-MM-DD 00:00:00");
-          params.endTime = this.formatTime(this.Time, "YYYY-MM-DD 23:59:59");
+          params.startTime = this.formatTime(this.Time[0], "YYYY-MM-DD 00:00:00");
+          params.endTime = this.formatTime(this.Time[1], "YYYY-MM-DD 23:59:59");
         }
         exportStoreByDayDailys(params).then(res=>{
             let blob = new Blob([res]);
@@ -121,8 +124,8 @@ import { storeByDayDailys,exportStoreByDayDailys } from "@/api/statistics.js";
           storeId:sessionStorage.getItem("storeId")
         }
         if(this.Time!=null){
-          params.startTime = this.formatTime(this.Time, "YYYY-MM-DD 00:00:00");
-          params.endTime = this.formatTime(this.Time, "YYYY-MM-DD 23:59:59");
+          params.startTime = this.formatTime(this.Time[0], "YYYY-MM-DD 00:00:00");
+          params.endTime = this.formatTime(this.Time[1], "YYYY-MM-DD 23:59:59");
         }
         storeByDayDailys(params).then(res=>{
           this.loading = false
diff --git a/src/pages/storeManage/memberList/memberList.vue b/src/pages/storeManage/memberList/memberList.vue
index 1c37342..782e59d 100644
--- a/src/pages/storeManage/memberList/memberList.vue
+++ b/src/pages/storeManage/memberList/memberList.vue
@@ -212,7 +212,7 @@
       <el-table-column
         align="center"
         v-if="state == 1"
-        label="密码"
+        label="支付密码"
         width="76"
         fixed="right"
         v-role="4007003"