From bbe690f5edeef3bb36fc05b7cdd510409e632fca Mon Sep 17 00:00:00 2001
From: Wangxubin <wangxubin1999@yeah.net>
Date: Fri, 25 Nov 2022 15:48:17 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                               |   2 +-
 src/api/login.js                              |   2 +-
 src/api/storeManage.js                        |   9 +
 src/components/project/index.vue              |   7 +-
 src/components/project/selection/index.vue    |   5 +
 src/login/login.vue                           |   4 +-
 .../eashier/collectionList/collectionList.vue |  11 +-
 .../raiseReatment/components/index.vue        |   7 +-
 src/pages/eashier/reatment/reatment.vue       |   2 +-
 src/pages/eashier/service/course.vue          |   1 -
 src/pages/eashier/service/service.vue         | 494 ++++++------------
 src/pages/statistics/storeDaily/form.vue      |  51 +-
 .../storeManage/baseProject/baseProject.vue   |  16 +-
 src/pages/storeManage/baseProject/project.vue | 219 ++++++++
 .../storeManage/dept/components/detail.vue    |   5 +-
 15 files changed, 468 insertions(+), 367 deletions(-)
 create mode 100644 src/pages/storeManage/baseProject/project.vue

diff --git a/config/index.js b/config/index.js
index bee214c..1271fd8 100644
--- a/config/index.js
+++ b/config/index.js
@@ -30,7 +30,7 @@ module.exports = {
         //target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         // target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         // target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式
-        // target: "http://139.9.58.205:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式华为云
+        // target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式华为云
         // target: "http://139.9.185.131:9094/", //设置你调用的接口域名和端口号 别忘了加http 盛联
         // target: "http://139.9.185.131:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式
         // target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达线上
diff --git a/src/api/login.js b/src/api/login.js
index 933a5fd..ffd89e1 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -4,7 +4,7 @@ import { localPath } from "./api.js";
 // 门店员工获取手机短信验证码接口
 export function getSmsCode(params) {
   return service({
-    url: "/api" + "/demay/ssm/staffLogin/getSmsCode",
+    url: "/api" + "/demay/ssm/staffLogin/getCode",
     method: "post",
     data: params
   });
diff --git a/src/api/storeManage.js b/src/api/storeManage.js
index 1048d9e..cdf670f 100644
--- a/src/api/storeManage.js
+++ b/src/api/storeManage.js
@@ -274,12 +274,21 @@ export function propageNew(params) {
 }
 //查询开疗程时人员
 export function selectRatioInfo(params) {
+  return service({
+    url: "/api" + "/demay/ssm/staff/selectRatioInfo",
+    method: "post",
+    data: params
+  });
+}
+
+export function selectRatioInfo1(params) {
   return service({
     url: "/api" + "/demay/ssm/pro/copyProject",
     method: "post",
     data: params
   });
 }
+
 //项目删除
 export function delpro(params) {
   return service({
diff --git a/src/components/project/index.vue b/src/components/project/index.vue
index 925a958..e1b30e4 100644
--- a/src/components/project/index.vue
+++ b/src/components/project/index.vue
@@ -1,9 +1,10 @@
 <template>
   <el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="dialogVisible" width="70%" append-to-body>
     <div class="flex justify-end padding-bottom-xs" v-if="!form.memberName">
-      <el-input class="form-width-m " size="small" v-model="queryForm.id" clearable placeholder="项目编码搜索"></el-input>
+      <el-input class="form-width-m " size="small" v-model="queryForm.price" clearable placeholder="项目价格搜索" style="margin-right:10px"></el-input>
+      <el-input class="form-width-m " size="small" v-model="queryForm.projectNum" clearable placeholder="项目编码搜索"></el-input>
       <el-input class="form-width-m margin-left-xs" size="small" v-model="queryForm.projectName" clearable placeholder="项目名称搜索"></el-input>
-      <el-button class="margin-left-xs" size="mini" type="primary" @click="getData">搜索</el-button>
+      <el-button class="margin-left-xs" size="mini" type="primary" @click="getData" style="height:0.16rem">搜索</el-button>
     </div>
     <div v-if="!form.memberName">
       <el-table @row-dblclick="confirms" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" :data="list" @row-click="rowClick" max-height="600" v-loading="listLoading" :element-loading-text="elementLoadingText">
@@ -121,7 +122,7 @@ export default {
       this.radio = row.id;
       this.radioForm = row;
     },
-    //分页方法
+    //分页方法coureList
     handleSizeChange(val) {
       //   //console.log(`每页 ${val} 条`);
       this.queryForm.pageSize = val;
diff --git a/src/components/project/selection/index.vue b/src/components/project/selection/index.vue
index 6c1e027..9e8ce00 100644
--- a/src/components/project/selection/index.vue
+++ b/src/components/project/selection/index.vue
@@ -1,5 +1,10 @@
 <template>
   <el-dialog title="项目列表" :visible.sync="dialogFormVisible" append-to-body width="60%" @close="close">
+    <div class="flex justify-end padding-bottom-xs" >
+      <el-input class="form-width-m " size="small" v-model="queryForm.projectNum" clearable placeholder="项目编码搜索"></el-input>
+      <el-input class="form-width-m margin-left-xs" size="small" v-model="queryForm.projectName" clearable placeholder="项目名称搜索"></el-input>
+      <el-button class="margin-left-xs" size="mini" type="primary" @click="fetchData">搜索</el-button>
+    </div>
     <el-table border :data="list" max-height="600" ref="list" v-loading="listLoading" :element-loading-text="elementLoadingText" @row-click="getCurrentRow" :row-class-name="rowName" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column :show-overflow-tooltip="true" align="center" prop="projectNum" label="项目编码" min-width="100"></el-table-column>
diff --git a/src/login/login.vue b/src/login/login.vue
index f43c3a2..a2ad99a 100644
--- a/src/login/login.vue
+++ b/src/login/login.vue
@@ -30,7 +30,7 @@
         </el-form>
       </div>
       <div v-if="showLogin==1">
-        <h2>手机号登录</h2>
+        <h2 style="cl">手机号登录</h2>
         <el-form :model="form" status-icon ref="user" label-width="100px" class="demo-user" @submit.native.prevent>
           <el-form-item label="手机号码：" prop="mobilePhone">
             <el-input @blur="staffOne" v-model="form.mobilePhone" placeholder="请输入手机号" maxlength="11"></el-input>
@@ -1060,7 +1060,7 @@ export default {
 #login {
   /* height: 100%;
   width: 100%; */
-  background-image: url(../../image/HomeBackground.png);
+  background-image: url(../../image/HomeBackground1.jpg);
   background-size: 100%;
   background-position: 50% 50%;
   background-repeat: no-repeat;
diff --git a/src/pages/eashier/collectionList/collectionList.vue b/src/pages/eashier/collectionList/collectionList.vue
index e2bf1b0..99ac755 100644
--- a/src/pages/eashier/collectionList/collectionList.vue
+++ b/src/pages/eashier/collectionList/collectionList.vue
@@ -4,10 +4,10 @@
       <el-form :model="form" :inline="true" label-width="80px">
         <el-form-item label="手机号码:">
           <div class="form-width-ms flex">
-            <el-input style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
-              <el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button>
+            <el-input oninput="this.value=this.value.replace(/\D/g,'')" style="height:100%" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
+              <el-button size="mini" slot="append" icon="el-icon-search"  @click="openMember"></el-button>
             </el-input>
-            <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button>
+            <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember" ></el-button>
           </div>
         </el-form-item>
         <el-form-item label="会员名称:">
@@ -1469,7 +1469,10 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
+::v-deep .el-input__inner{
+  height: 38px;
+}
 .collection {
   background: white;
   margin-left: 25px;
diff --git a/src/pages/eashier/raiseReatment/components/index.vue b/src/pages/eashier/raiseReatment/components/index.vue
index fea9603..f1c5e89 100644
--- a/src/pages/eashier/raiseReatment/components/index.vue
+++ b/src/pages/eashier/raiseReatment/components/index.vue
@@ -24,7 +24,7 @@
       </el-form-item>
       <el-form-item label="待付金额:" :label-width="labelWidth">
         <div class="form-width-ms">
-          {{ debtMoney < 0 ? '超出 ' + (debtMoney * -1) : debtMoney }} </div>
+          {{ (0>debtMoney)? '超出 ' + (debtMoney * -1) : debtMoney }} </div>
       </el-form-item>
       <el-form-item label="业务时间:" :label-width="labelWidth" v-show="isAddition == 1">
         <div class="form-width-ms">
@@ -298,6 +298,7 @@ export default {
       localStorage.setItem("text", text);
     },
     staffratioData(v) {
+      console.log('v--->',v)
       let form = this.outList[this.editIndex];
       form.rows = v.list;
       form.staffLists=v.list
@@ -485,15 +486,12 @@ export default {
       row.index = rowIndex;
     },
     projectData(form,rows) {
-      console.log("🚀 ~ file: index.vue ~ line 478 ~ projectData ~ rows", rows)
-      console.log("🚀 ~ file: index.vue ~ line 474 ~ projectData ~ form", form)
       form.memberId = this.proForm.memberId;
       form.memberName = this.proForm.memberName;
       form.mobilePhone = this.proForm.mobilePhone;
       form.storeId = this.proForm.storeId;
       form.storeName = this.proForm.storeName;
       form.memberIdentityCard = this.proForm.identityCard;
-
       if (this.openProText == 0) {
         (form.priceMember * form.minumumTimes).toFixed(2) * 1;
         form.prices = form.priceMember
@@ -528,7 +526,6 @@ export default {
         form.accountId = form.id;
         console.log("🚀 ~ file: index.vue ~ line 520 ~ projectData ~ rows", rows)
         form.staffLists=rows
-        
         form.cardAchievementAmount=rows[0].cardAchievementAmount
         form.cardCommissionAmount=rows[0].cardCommissionAmount
         form.cardSalesAchievement=rows[0].cardSalesAchievement
diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue
index bd82398..e267b42 100644
--- a/src/pages/eashier/reatment/reatment.vue
+++ b/src/pages/eashier/reatment/reatment.vue
@@ -4,7 +4,7 @@
       <el-form :model="form" :inline="true" :label-width="formLabelwidth">
         <el-form-item label="手机号码:">
           <div class="form-width-ms flex">
-            <el-input style="padding-left:0px;width:123px " ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
+            <el-input style="padding-left:0px;width:123px;height:100%" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
               <el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button>
             </el-input>
             <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button>
diff --git a/src/pages/eashier/service/course.vue b/src/pages/eashier/service/course.vue
index 1d4e383..8d48bf1 100644
--- a/src/pages/eashier/service/course.vue
+++ b/src/pages/eashier/service/course.vue
@@ -78,7 +78,6 @@ export default {
         if (res.code == "000000") {
           this.list = res.rows;
           var storeId=sessionStorage.getItem("storeId")
-          console.log('shopname--->',shopname)
           this.lists =this.list.filter(item=>item.storeId != storeId)
           this.list = this.list.filter(item=>item.storeId == storeId)
         } else {
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index c438dc2..07d1559 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -8,6 +8,7 @@
             maxlength="11"
             v-model="memberForm.mobilePhone"
             @change="inputMember"
+            style="height:100%;"
           >
             <el-button
               size="mini"
@@ -15,19 +16,22 @@
               maxlength="11"
               icon="el-icon-search"
               @click="openMember"
+              style="height: 100%;"
             ></el-button>
           </el-input>
           <el-button
             icon="el-icon-circle-plus-outline"
             type="text"
             @click="openAddMember"
+            style="height: 100%;"
           ></el-button>
         </div>
       </el-form-item>
       <el-form-item :label="cashNumber == 1 ? '会员名字' : '散客名字'">
         <div class="form-width-sm text-cyan">
-          <el-input v-model="memberForm.memberName">
+          <el-input v-model="memberForm.memberName" style="height: 100%;">
             <el-button
+              style="height: 100%;"
               title="切换"
               size="mini"
               slot="append"
@@ -38,15 +42,17 @@
         </div>
       </el-form-item>
       <el-form-item label="性别">
-        <div class="text-bold flex justify-start align-center text-xss">
+        <div class="text-bold flex justify-start align-center text-xss" style="height: 100%;">
           男:
           <el-input
+            style="height:100%;"
             class="form-width-xss"
             v-model="memberForm.man"
             type="number"
           ></el-input>
           女:
           <el-input
+            style="height:100%;"
             class="form-width-xss"
             v-model="memberForm.woman"
             type="number"
@@ -77,7 +83,7 @@
         v-if="cashNumber == 1"
       >
         <reccard ref="reccard" @reccardData="reccardData"></reccard>
-        <el-button slot="reference">充值卡</el-button>
+        <el-button slot="reference" style="height: 0.2rem;">充值卡</el-button>
       </el-popover>
       <el-popover
         placement="bottom"
@@ -86,9 +92,9 @@
         v-if="cashNumber == 1"
       >
         <course ref="course" @courseData="courseData"></course>
-        <el-button slot="reference">项目包</el-button>
+        <el-button slot="reference" style="height: 0.2rem;">项目包</el-button>
       </el-popover>
-      <el-button v-if="cashNumber ===1 " @click="updataPassword">密码修改</el-button>
+      <el-button v-if="cashNumber ===1 " @click="updataPassword" style="height: 0.2rem;">密码修改</el-button>
       <el-form-item label="补单日期:" v-if="isAddition == 1">
         <div class="activeFormDiv">
           <el-date-picker
@@ -120,189 +126,6 @@
             color: '#eeeeee'
           }"
         >
-          <!-- <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">
-                  <el-form-item label="美发师">
-                    <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="请选择"
-                        @change="
-                          handleChange($event, scope.row, 'zhonggongList')
-                        "
-                      >
-                        <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>
-                  </el-form-item>
-                  <el-form-item label="美容师">
-                    <div class="flex align-center form-width-m">
-                      <el-select
-                        filterable
-                        default-first-option
-                        clearable
-                        @clear="clear(scope.row, 'largeList')"
-                        v-model="scope.row.largeLists"
-                        placeholder="请选择"
-                        @change="handleChange($event, scope.row, 'largeList')"
-                      >
-                        <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>
-                  </el-form-item>
-                  <el-form-item label="技师">
-                    <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="请选择"
-                        @change="
-                          handleChange($event, scope.row, 'technicianList')
-                        "
-                      >
-                        <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>
-                  </el-form-item>
-                  <el-form-item label="助理">
-                    <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="请选择"
-                        @change="handleChange($event, scope.row, 'smallList')"
-                      >
-                        <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>
-                  </el-form-item>
-                  <el-form-item label="高管">
-                    <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="请选择"
-                        @change="handleChange($event, scope.row, 'managerList')"
-                      >
-                        <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>
-                  </el-form-item>
-                  <el-form-item label="管理层">
-                    <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="请选择"
-                        @change="handleChange($event, scope.row, 'adminList')"
-                      >
-                        <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>
-                  </el-form-item>
-                  <br />
-                </el-form>
-              </div>
-            </template>
-          </el-table-column> -->
           <el-table-column
             show-overflow-tooltip
             min-width="150"
@@ -314,7 +137,6 @@
                 <el-input
                   v-model="scope.row.projectNum"
                   placeholder="编码"
-                  @blur="proBlur(scope.row, (proIndex = scope.$index))"
                   @change="proBlur(scope.row, (proIndex = scope.$index))"
                 >
                   <el-button
@@ -350,6 +172,29 @@
                 : "未设"
             }}</template>
           </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            min-width="170"
+            align="center"
+            prop=""
+            label="支付类型"
+          >
+          <template slot-scope="scope">
+            <div v-if="scope.row.courseAccountId">
+              疗程付
+            </div>
+            <div v-else>
+              <div v-if="cashNumber ==1">
+                <div v-if=" scope.row.transactionPrice!=0">
+                  <el-radio v-model="scope.row.radio" label="1" @input="radioInput(scope.row)">现付</el-radio>
+                  <el-radio v-model="scope.row.radio" label="2" @input="radioInput(scope.row)">卡付</el-radio>
+                </div>  
+                <div v-else>现付</div>
+              </div>  
+              <div v-else>现付</div>
+            </div>
+          </template>
+          </el-table-column>
           <el-table-column
             show-overflow-tooltip
             min-width="120"
@@ -373,19 +218,6 @@
               <div v-else>{{ scope.row.transactionPrice }}</div>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            min-width="120"
-            align="center"
-            prop=""
-            label="支付类型"
-          >
-            <template slot-scope="scope">
-              <div>
-                {{ scope.row.courseAccountId != null ? "疗程付" : "卡付/现付" }}
-              </div>
-            </template>
-          </el-table-column>
           <el-table-column
             show-overflow-tooltip
             min-width="120"
@@ -394,10 +226,11 @@
             label="充值卡付"
           >
             <template slot-scope="props">
-              <div
-                @click.stop="projectindex(props.$index)"
-                v-if="props.row.isCardPay == 0"
-              >
+              <div v-if="props.row.isCardPay == 0">
+                <div
+                  @click.stop="projectindex(props.$index)"
+                  v-if="props.row.radio == 2"
+                >
                 <el-popover
                   placement="bottom"
                   width="900"
@@ -425,8 +258,6 @@
                         label="卡付名称"
                         width="110"
                       ></el-table-column>
-                      <!-- cardConsumeMoney cardOver -->
-                      <!-- --- -->
                       <el-table-column align="center" label="类别" width="60">
                         <template slot-scope="scope">
                           <span v-if="scope.row.type == 1">折扣卡</span>
@@ -441,7 +272,6 @@
                         prop="discount"
                         label="折扣(%)"
                       ></el-table-column>
-                      <!-- <el-table-column align="center" prop="offsetMoney" label="可抵扣额" width="100"></el-table-column> -->
                       <el-table-column
                         align="center"
                         prop="spendMoney"
@@ -469,8 +299,6 @@
                           ></el-input>
                         </template>
                       </el-table-column>
-                      <!-- <el-table-column align="center" prop="discoutMoney" label="抵扣支付" width="100"></el-table-column> -->
-                      <!-- cardOversActive  cardOvers-->
                       <el-table-column
                         align="center"
                         prop="cardOvers"
@@ -506,33 +334,6 @@
                         label="赠送剩余"
                         width="70"
                       ></el-table-column>
-                      <!-- <el-table-column
-                        align="center"
-                        prop="cardConsumeMoney"
-                        label="可用金额"
-                        width="50"
-                      ></el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="CardCurrentUse"
-                        show-overflow-tooltip
-                        label="当前行可用"
-                        width="50"
-                      >
-                      <template slot-scope="scope">
-                        {{ scope.row.CardCurrentUse?scope.row.CardCurrentUse:scope.row.cardOvers }}
-                      </template>
-                      </el-table-column>
-                        <el-table-column
-                        align="center"
-                        prop="cardSum"
-                        show-overflow-tooltip
-                        label="本单使用"
-                        width="50"
-                      >
-                      <template slot-scope="scope">
-                        {{ scope.row.cardSum?scope.row.cardSum:0 }}
-                      </template></el-table-column> -->
                       <el-table-column
                         align="center"
                         prop="storeName"
@@ -543,9 +344,12 @@
                       </el-table-column>
                     </el-table>
                   </div>
-                  <!-- <recash ref="recash" @recashData="recashData"></recash> -->
                   <el-button slot="reference">充值卡</el-button>
                 </el-popover>
+                </div>
+                <div v-else>
+                  不允许卡付
+                </div>
               </div>
               <div v-else>不允许卡付</div>
             </template>
@@ -823,29 +627,6 @@
           </el-table-column>
         </el-table>
       </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">
@@ -854,6 +635,7 @@
           style="margin-top:3px;width:100%"
           :data="cardList"
           :row-key="getRowKeys"
+          show-summary
           :header-cell-style="{
             background: 'linear-gradient(#6cb3ff, #1873d4)',
             color: '#eeeeee'
@@ -873,8 +655,10 @@
             min-width="80px"
             align="center"
             label="折扣"
-            prop="discount"
           >
+          <template slot-scope="scope">
+            {{ scope.row.discount+'' }}
+          </template>
         </el-table-column>
         <el-table-column label="用前金额" align="center">
           <el-table-column
@@ -882,21 +666,19 @@
             align="center"
             label="充值"
             min-width="110"
-            prop="cardRestMoney"
           >
           <template slot-scope="scope">
-            {{ scope.row.cardRestMoney?scope.row.cardRestMoney:0 }}
+            {{ 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 }}
+            {{ scope.row.giftConsumeMoney?scope.row.giftConsumeMoney+'':0 }}
           </template>
         </el-table-column>
         </el-table-column>
@@ -928,30 +710,28 @@
           <el-table-column
               show-overflow-tooltip
               align="center"
-              prop="numRemainder"
               min-width="110"
               label="充值"
             >
             <template slot-scope="scope">
-              {{ scope.row.numRemainder }}
+              {{ 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 }}
+              {{  scope.row.giveRemainder+'' }}
             </template>
           </el-table-column>
         </el-table-column>
         </el-table-column>
         </el-table>
         </div>
-        <div class="right">
+        <!-- <div class="right">
           <el-form ref="form" label-width="65px">
             <el-form-item label="结算金额:">
               <span>{{numlist[0].settlementNum}}</span>
@@ -960,8 +740,7 @@
               <span>{{numlist[0].payNum}}</span>
             </el-form-item>
           </el-form>
-          <!-- <div id="Charts" style="width:100%;height:200px"></div> -->
-        </div>
+        </div> -->
         <div class="left" style="margin-right:15px">
         <div
         class="border-radius-10 border margin-left-xs  bg-white padding-xs"
@@ -1214,6 +993,47 @@ export default {
     }
   },
   methods: {
+    // 切换卡付/现付
+    radioInput(row){
+      if(row.radio==1){
+        // 现付
+        row.transactionPrice = row.price
+        // 如果有充值卡要清空并且把现付清空
+        this.$refs.payment.payLists.forEach(item=>item.payMoney = 0)
+        if(row.rechargeAccountList.length){ //充值卡存在
+          // 清空充值卡钱
+          row.rechargeAccountList.forEach(item=>{
+            item.spendMoney?item.spendMoney*1:0
+            item.giftSpendMoney?item.giftSpendMoney*1:0
+            item.cardOvers = (item.cardOvers + item.spendMoney).toFixed(2)*1 // 恢复可用金额
+            item.spendMoney = 0
+            item.cardGiftOvers = (item.cardGiftOvers + item.giftSpendMoney).toFixed(2)*1
+            item.giftSpendMoney =0
+          })
+          this.updataList()
+        }
+      }else{
+        // 卡付
+        row.transactionPrice = row.priceMember
+        console.log('点击了卡付--',row)
+        // 如果有充值卡要清空并且把现付重新清空
+        this.$refs.payment.payLists.forEach(item=>item.payMoney = 0)
+        if(row.rechargeAccountList.length){ //充值卡存在
+          // 清空充值卡钱
+          row.rechargeAccountList.forEach(item=>{
+            item.spendMoney?item.spendMoney*1:0
+            item.giftSpendMoney?item.giftSpendMoney*1:0
+            item.cardOvers = (item.cardOvers + item.spendMoney).toFixed(2)*1 // 恢复可用金额
+            item.spendMoney = 0
+            item.cardGiftOvers = (item.cardGiftOvers + item.giftSpendMoney).toFixed(2)*1
+            item.giftSpendMoney =0
+          })
+        }
+      }
+      this.list.push({})
+      this.list.pop()
+      this.updataList()
+    },
     // 输入新密码
     handleNewPassword(val){
       let params = {
@@ -1249,8 +1069,16 @@ export default {
         mobilePhone:this.memberForm.mobilePhone
       }
       getSmsCode(params).then(res=>{
-        if(res.code == '000000'){
+        if(res.code == '200007'){
           this.$message.success({ message: "验证码已发送,注意查看手机" });
+        }else{
+           this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
         }
       })
     }, 
@@ -1414,13 +1242,12 @@ export default {
               // 当前金额大于当前值
               console.log('当前剩余金额-->',appearPrice,'折扣是多少-->',row.discount)
               row.spendMoney = (appearPrice*(row.discount*1/100)).toFixed(2)*1
-              // this.updataList()
             }
           }else{
             // 有赠送金额
             let total = (row.cardOvers/(row.discount*1)*100 + ( row.cardGiftOvers/( (row.discountFreeAmount?row.discountFreeAmount:100)*1 )*100 )).toFixed(2)*1
-            let balanceProportion = (row.cardConsumeMoney*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //可用余额比例
-            let giveProportion = (row.cardGiftOvers*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //赠送金额比例
+            let balanceProportion = (row.cardOvers*1)/(row.cardOvers*1 + row.cardGiftOvers*1) //可用余额比例
+            let giveProportion = (row.cardGiftOvers*1)/(row.cardOvers*1 + row.cardGiftOvers*1) //赠送金额比例
             let balanceConverted = balanceProportion/(row.discount?(row.discount*1/100):1) //可用折算 (比例除以折扣)
             let giveConverted = giveProportion/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1) //赠送折算
             let convertedNum = appearPrice/(balanceConverted+giveConverted) //消费金额折算份数
@@ -1431,14 +1258,12 @@ export default {
               row.giftSpendMoney = (convertedNum*giveProportion).toFixed(2)*1
               row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
               console.log('剩了多少--->',row.cardGiftOvers)
-              // this.updataList()
             }else{
               // 如果总额不够付,扣掉所有的折扣可用余额并且把剩余金额也扣掉
               console.log('我不够扣',total)
-              row.spendMoney = row.cardConsumeMoney
-              row.giftSpendMoney = row.cardGiftOvers
+              row.spendMoney = (row.cardOvers).toFixed(2)*1
+              row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
               row.cardGiftOvers = 0
-              // this.updataList()
             }
           }
  
@@ -1448,16 +1273,12 @@ export default {
           console.log('还需支付多少--->',appearPrice)
           if(total>appearPrice){ // 总额大于待支付金额
             // 够付的情况按照比例扣除
-            let balanceProportion = (row.cardConsumeMoney*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //可用余额比例
-            let giveProportion = (row.cardGiftOvers*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //赠送金额比例
-            // row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1
-            // row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1
             row.spendMoney = (appearPrice*row.cardOvers/( row.cardGiftOvers+row.cardOvers )).toFixed(2)*1
             row.giftSpendMoney = (appearPrice*row.cardGiftOvers/( row.cardGiftOvers+row.cardOvers )).toFixed(2)*1
             row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
           }else{ 
-            row.spendMoney = row.cardOvers
-            row.giftSpendMoney = row.cardGiftOvers
+            row.spendMoney = (row.cardOvers).toFixed(2)*1
+            row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
             row.cardGiftOvers = 0
             // this.updataList()
           }
@@ -1475,11 +1296,11 @@ export default {
         this.$message.warning({ message: "当前卡付余额为0,将自动扣除赠送金额" });
         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
+          row.spendMoney = (row.giftSpendMoney).toFixed(2)*1
+          row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
         }else{ //当前卡不够支付
-          row.spendMoney = row.cardGiftOvers
-          row.giftSpendMoney = row.cardGiftOvers
+          row.spendMoney = (row.cardGiftOvers).toFixed(2)*1
+          row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
           row.cardGiftOvers = 0
         }
         return
@@ -1488,15 +1309,15 @@ export default {
           if( (row.cardOvers/(row.discount?(row.discount*1)/100:1)) > appearPrice ){ //自己本身折扣金额够扣,直接扣除本身
             row.spendMoney = (appearPrice*(row.discount?(row.discount*1)/100:1)).toFixed(2)*1
           }else{  //不够扣时,扣光自己的可用余额并且算上差价继续扣赠送金额
-            row.spendMoney = row.cardOvers
+            row.spendMoney = (row.cardOvers).toFixed(2)*1
             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
+            row.giftSpendMoney =( remainderCsee*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1)).toFixed(2)*1 //算出还需支付多少
+            row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
           }
         }else{ //折后金额总和不够支付项目金额,直接扣除
-          row.spendMoney = row.cardOvers // 支付金额 直接赋值支付金额
-          row.giftSpendMoney = row.cardGiftOvers //赠送支付-- 赋值所有赠送支付
+          row.spendMoney = (row.cardOvers).toFixed(2)*1 // 支付金额 直接赋值支付金额
+          row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1 //赠送支付-- 赋值所有赠送支付
           row.cardGiftOvers = 0 //清空赠送剩余
         }
         }else{ //不能打折
@@ -1506,10 +1327,10 @@ export default {
             if( total>appearPrice ){ //当前卡够支付
               row.spendMoney = appearPrice
               row.giftSpendMoney = appearPrice
-              row.cardGiftOvers = row.cardGiftOvers - appearPrice
+              row.cardGiftOvers = (row.cardGiftOvers - appearPrice).toFixed(2)*1
             }else{ //当前卡剩余余额不够支付
-              row.spendMoney = row.cardGiftOvers
-              row.giftSpendMoney = row.cardGiftOvers
+              row.spendMoney = (row.cardGiftOvers).toFixed(2)*1
+              row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
               row.cardGiftOvers = 0
             }
             return
@@ -1519,13 +1340,13 @@ export default {
             row.spendMoney = appearPrice
            }else{ //需要算上差价
             let remainderCsee = appearPrice - row.cardOvers //赠送还要补充多少
-            row.spendMoney = row.cardOvers
-            row.giftSpendMoney = remainderCsee
-            row.cardGiftOvers = row.cardGiftOvers - remainderCsee
+            row.spendMoney = (row.cardOvers).toFixed(2)*1
+            row.giftSpendMoney = (remainderCsee).toFixed(2)*1
+            row.cardGiftOvers = (row.cardGiftOvers - remainderCsee).toFixed(2)*1
            }
           }else{ //当前卡不够支付项目金额
-            row.spendMoney = row.cardOvers
-            row.giftSpendMoney = row.cardGiftOvers
+            row.spendMoney = (row.cardOvers).toFixed(2)*1
+            row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
             row.cardGiftOvers = 0
           }
         }
@@ -2196,29 +2017,34 @@ export default {
     },
 
     endEditMoney(row) {
+      // transactionPrice
       let form = { ...row };
-
-      if (this.cashNumber == 1) {
-        if (
-          form.topPriceMember < form.transactionPrice * 1 ||
-          form.transactionPrice * 1 < form.minumumPriceMember
-        ) {
-          this.$message.error({
-            message:
-              "价格不能低于" +
-              form.minumumPriceMember +
-              "高于" +
-              form.topPriceMember
-          });
-          form.transactionPrice = this.transactionPrice;
-        } else {
-          form.amount = row.transactionPrice;
+      if (this.cashNumber == 1) {  //是会员的情况
+        if(row.radio == 2){
+          if (form.topPriceMember < form.transactionPrice * 1 ||form.transactionPrice * 1 < form.minumumPriceMember){
+            this.$message.error({
+              message:
+                "价格不能低于" +
+                form.minumumPriceMember +
+                "高于" +
+                form.topPriceMember
+            });
+            form.transactionPrice = this.transactionPrice;
+          } else {
+            form.amount = row.transactionPrice;
+          }
+        }else{
+          if (form.topPrice < form.transactionPrice * 1 ||form.transactionPrice * 1 < form.minumumPrice){
+            this.$message.error({
+              message: "价格不能低于" + form.minumumPrice + "高于" + form.topPrice
+            });
+            form.transactionPrice = this.transactionPrice;
+          } else {
+            form.amount = row.transactionPrice;
+          }          
         }
-      } else {
-        if (
-          form.topPrice < form.transactionPrice * 1 ||
-          form.transactionPrice * 1 < form.minumumPrice
-        ) {
+      } else { //不是会员
+        if (form.topPrice < form.transactionPrice * 1 ||form.transactionPrice * 1 < form.minumumPrice) {
           this.$message.error({
             message: "价格不能低于" + form.minumumPrice + "高于" + form.topPrice
           });
@@ -2424,15 +2250,16 @@ export default {
             projectId: res.data.id,
             storeId: res.data.storeId,
             storeName: res.data.storeName,
-            price: res.data.price,
-            topPrice: res.data.topPrice,
-            topPriceMember: res.data.topPriceMember,
-            priceMember: res.data.priceMember,
-            minumumPrice: res.data.minumumPrice,
-            minumumPriceMember: res.data.minumumPriceMember,
+            price: res.data.price, //散客标价
+            topPrice: res.data.topPrice, //散客最高价
+            topPriceMember: res.data.topPriceMember, //会员最高价
+            priceMember: res.data.priceMember, // 会员标价
+            minumumPrice: res.data.minumumPrice, //散客最低价
+            minumumPriceMember: res.data.minumumPriceMember, //会员最低价
             cashNumber: this.cashNumber,
             numberTimes: 1,
-            minumumTimes: res.data.minumumTimes
+            minumumTimes: res.data.minumumTimes,
+            radio:'2' //默认卡付
           };
           this.setRecList(form);
           if (this.cashNumber == 1) {
@@ -2660,7 +2487,6 @@ export default {
             rechargeAccountList.push(item);
           }
         });
-        // item.rechargeAccountListCopy = item.rechargeAccountList;
         item.rechargeAccountList = rechargeAccountList;
         if (item.courseAccountId != null) {
           item.collectionAmount = item.amount;
diff --git a/src/pages/statistics/storeDaily/form.vue b/src/pages/statistics/storeDaily/form.vue
index 685e0d6..4bf7a1e 100644
--- a/src/pages/statistics/storeDaily/form.vue
+++ b/src/pages/statistics/storeDaily/form.vue
@@ -1,15 +1,12 @@
 <template>
+  <div>
     <div class="box">
         <div class="left">
-          <el-table v-loading="loading" :data="tableDate" :header-cell-style="{
+          <el-table v-loading="loading" v-if="$route.path !=='/storeDaily'" :data="tableDate" :header-cell-style="{
               background: 'linear-gradient(#6cb3ff, #1873d4)',
               color: '#eeeeee',
             }" show-summary border max-height="600">
             <el-table-column align="center" min-width="75" prop="date" label="日期"></el-table-column>
-            <!-- <el-table-column align="center" label="总营业额"></el-table-column>
-            <el-table-column align="center" label="充值业绩"></el-table-column>
-            <el-table-column align="center" label="疗程业绩"></el-table-column>
-            <el-table-column align="center" label="充值卡购买疗程"  min-width="100"></el-table-column> -->
             <el-table-column align="center" label="服务">
               <el-table-column align="center"  prop="cashMoney" label="总金额">
               </el-table-column>
@@ -53,11 +50,45 @@
             <!-- <el-table-column align="center" min-width="60" prop="memberNum" label="总数" v-if="headOffice==1"></el-table-column> -->
             </el-table-column>
           </el-table>
+          <el-table v-loading="loading" v-else :data="tableDate" :header-cell-style="{
+            background: 'linear-gradient(#6cb3ff, #1873d4)',
+            color: '#eeeeee',
+          }" show-summary border max-height="600">
+          <el-table-column align="center" min-width="75" prop="date" label="日期"></el-table-column>
+          <el-table-column align="center" label="总营业额" prop="numAmount">
+          </el-table-column>
+          <el-table-column align="center" label="充值业绩" prop="rechargeMoneys"></el-table-column>
+          <el-table-column align="center" label="疗程业绩" prop="coursexMoneys"></el-table-column>
+          <el-table-column align="center" label="充值卡购买疗程"  min-width="100" prop="coursekMoney"></el-table-column>
+          <el-table-column align="center" label="服务">
+            <el-table-column align="center" prop="cashierCashMoney" label="现付">
+            </el-table-column>
+            <el-table-column align="center" prop="cashierCardMoney" label="卡付">
+            </el-table-column>
+          </el-table-column>
+          <el-table-column align="center" label="客单数">
+            <el-table-column align="center" min-width="60" prop="rechargeOrderNum" label="充值">
+            </el-table-column>
+            <el-table-column align="center" min-width="60" prop="courseOrderNum" label="疗程">
+            </el-table-column>
+            <el-table-column align="center" min-width="60" prop="cashPeopleNum" label="服务">
+            </el-table-column>
+          </el-table-column>
+          <el-table-column align="center" label="项目男女客数">
+            <el-table-column align="center" min-width="60" prop="man" label="男客">
+            </el-table-column>
+            <el-table-column align="center" min-width="60" prop="woman" label="女客">
+            </el-table-column>
+            </el-table-column>
+          <el-table-column align="center" min-width="60" prop="refundMoney" label="退款金额"></el-table-column>
+          <el-table-column align="center" min-width="60" prop="refundMoney" label="消费退"></el-table-column>
+          </el-table>
         </div>
         <div class="right">
             <payment style="width:100%"  ref="payment" :payLists='payLists' :pay='pay'/>
         </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -79,6 +110,12 @@ export default {
         handler(arr){
           if(arr){
             this.tableDate = arr
+            this.tableDate = this.tableDate.map(item=>{
+              return{
+                ...item,
+                numAmount:(item.rechargeMoneys?item.rechargeMoneys*1:0)+(item.coursexMoneys?item.coursexMoneys*1:0)+(item.coursekMoney?item.coursekMoney*1:0)
+              }
+            })
           }else{
             this.tableDate = []
           }
@@ -123,13 +160,14 @@ export default {
             state: 1
         }).then(res=>{
             if(res.code === '000000'){
-                this.payLists = res.rows      
+                this.payLists = res.rows     
             }
         })
       },
     },
     created(){
         this.initpay()
+        console.log(this.$route.path ==='/storeDaily')
     },
 }
 </script>
@@ -139,6 +177,7 @@ export default {
         display: flex;
         flex-wrap: wrap;
         justify-content: center;
+        margin-bottom: 30px;
     }
     .left{
         /* flex: 1; */
diff --git a/src/pages/storeManage/baseProject/baseProject.vue b/src/pages/storeManage/baseProject/baseProject.vue
index 79da4a2..02c1a22 100644
--- a/src/pages/storeManage/baseProject/baseProject.vue
+++ b/src/pages/storeManage/baseProject/baseProject.vue
@@ -1015,7 +1015,7 @@ import wage from "./wage/wage";
 import excel from "../../../components/excel";
 import detail from "./components/detail.vue";
 import edit from "./components/edit.vue";
-import project from "@/components/project/index";
+import project from "./project.vue";
 import selectpro from "@/components/project/selection/index";
 import {
   delpro,
@@ -1531,13 +1531,13 @@ export default {
 
               console.log(this.format);
 
-              res.pageInfo.list.forEach(item => {
-                if (item.unifiedDue < this.format) {
-                  item.state = 0;
-                }else{
-                  item.state = 1;
-                }
-              });
+              // res.pageInfo.list.forEach(item => {
+              //   if (item.unifiedDue < this.format) {
+              //     item.state = 0;
+              //   }else{
+              //     item.state = 1;
+              //   }
+              // });
               console.log(
                 "🚀 ~ file: chargeType.vue ~ line 730 ~ TypePage ~ res.pageInfo.tableList",
                 res.pageInfo.tableList
diff --git a/src/pages/storeManage/baseProject/project.vue b/src/pages/storeManage/baseProject/project.vue
new file mode 100644
index 0000000..2e28916
--- /dev/null
+++ b/src/pages/storeManage/baseProject/project.vue
@@ -0,0 +1,219 @@
+<template>
+  <el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="dialogVisible" width="70%" append-to-body>
+    <div class="flex justify-end padding-bottom-xs" v-if="!form.memberName">
+      <el-input class="form-width-m " size="small" v-model="queryForm.projectNum" clearable placeholder="项目编码搜索"></el-input>
+      <el-input class="form-width-m margin-left-xs" size="small" v-model="queryForm.projectName" clearable placeholder="项目名称搜索"></el-input>
+      <el-button class="margin-left-xs" size="mini" type="primary" @click="getData">搜索</el-button>
+    </div>
+    <div v-if="!form.memberName">
+      <el-table @row-dblclick="confirms" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" :data="list" @row-click="rowClick" max-height="600" v-loading="listLoading" :element-loading-text="elementLoadingText">
+        <el-table-column label="选择" width="45">
+          <template slot-scope="scope">
+            <el-radio v-model="radio" :label="scope.row.id" @change.native="scope.row">
+              {{ "" }}
+            </el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" align="center" prop="projectNum" label="项目编码" min-width="100"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" align="center" prop="projectName" label="项目名称" min-width="120"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" align="center" prop="minumumTimes" label="最低销售次数" min-width="60"></el-table-column>
+        <el-table-column align="center" label="散客">
+          <el-table-column align="center" min-width="75" prop="price" label="标价"></el-table-column>
+          <el-table-column align="center" min-width="80" prop="topPrice" label="最高价"></el-table-column>
+          <el-table-column align="center" min-width="80" prop="minumumPrice" label="最低价"></el-table-column>
+        </el-table-column>
+        <el-table-column align="center" label="会员">
+          <el-table-column align="center" min-width="75" prop="priceMember" label="标价"></el-table-column>
+          <el-table-column align="center" min-width="80" prop="topPriceMember" label="最高价"></el-table-column>
+          <el-table-column align="center" min-width="80" prop="minumumPriceMember" label="最低价"></el-table-column>
+        </el-table-column>
+        <el-table-column align="center" prop="isCardPay" label="允许卡付" min-width="80" v-if="queryForm.directConsumption==1">
+          <template slot-scope="scope">{{
+            scope.row.isCardPay == 0 ? "是"  :  scope.row.isCardPay == 1?'否':"未设"
+          }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="noDiscount" label="卡付打折" min-width="80" v-if="queryForm.directConsumption==1">
+          <template slot-scope="scope">{{
+            scope.row.noDiscount == 0 ? "是"  :  scope.row.noDiscount == 1?'否':"未设"
+          }}</template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <el-table @row-dblclick="confirms" v-else :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" :data="coureList" @row-click="rowClick" max-height="600" v-loading="listLoading" :element-loading-text="elementLoadingText">
+      <el-table-column label="选择" width="45">
+        <template slot-scope="scope">
+          <el-radio v-model="radio" :label="scope.row.id" @change.native="scope.row">
+            {{ "" }}
+          </el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip min-width="100" align="left" prop="courseProjectNum" label="项目编码"></el-table-column>
+      <el-table-column show-overflow-tooltip min-width="120" align="left" prop="courseProjectName" label="项目名称"></el-table-column>
+      <el-table-column show-overflow-tooltip min-width="70" align="center" prop="price" label="项目单价"></el-table-column>
+      <el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseRestCount" label="剩余次数"></el-table-column>
+      <el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseRestPrice" label="剩余金额"></el-table-column>
+      <el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseConsumeCount" label="可用次数"></el-table-column>
+      <el-table-column show-overflow-tooltip min-width="105" align="center" prop="endTime" label="到期日期"></el-table-column>
+      <el-table-column show-overflow-tooltip min-width="120" align="center" prop="storeName" label="所属门店"></el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <el-pagination v-if="!form.memberName" align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="mini" type="primary" plain @click="dialogVisible = false">取 消</el-button>
+      <el-button size="mini" type="primary" @click="confirms()">确 定
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { propageNew,selectRatioInfo1 } from "@/api/storeManage.js";
+import { couAccountList } from "@/api/eashier.js";
+export default {
+  data() {
+    return {
+      radio: null, //单选值
+      radioForm: {}, //单选对象
+      list: [], //主数组
+      coureList: [],
+      dialogVisible: false, //弹窗开关
+      listLoading: false, //list加载提示开启动画
+      elementLoadingText: "数据加载中...", //list加载提示文字
+      title: "选择门店项目", //弹窗标题
+      total: 0, //分页总条数
+      form: {}, //主对象
+      queryForm: {
+        //查询对象
+        pageNum: 1,
+        pageSize: 10,
+        state: 1,
+        projectName: "",
+      },
+      courseProjectId: "", //选中的会员疗程卡包,
+      isform:"",
+      projectId:"",
+      rows:[]
+    };
+  },
+  methods: {
+    //组件传值
+    show(form, id) {
+      this.isform=form
+      this.courseProjectId = id;
+      this.coureList = [];
+      this.list = [];
+      this.form = {};
+      if (form == 1 || form == 0 || form == 3) {
+        if (form != 3) {
+          this.queryForm.directConsumption = form;
+        }
+      } else {
+        this.form = { ...form };
+      }
+      this.radio = null;
+      this.radioForm = {};
+      this.list = [];
+      this.dialogVisible = true;
+      this.getData();
+    },
+    //点击选中
+    rowClick(row) {
+      this.radio = row.id;
+      this.radioForm = row;
+    },
+    //分页方法
+    handleSizeChange(val) {
+      //   //console.log(`每页 ${val} 条`);
+      this.queryForm.pageSize = val;
+      this.getData();
+    },
+    handleCurrentChange(val) {
+      //   //console.log(`当前页: ${val}`);
+      this.queryForm.pageNum = val;
+      this.getData();
+    },
+    //获取数据
+    async getData() {
+      this.listLoading = true;
+      if (this.form.memberName) {
+        this.title = "选择会员卡包疗程";
+        var memberIds = {
+          memberId: this.form.id,
+          storeId:this.form.storeId
+        };
+        if (this.courseProjectId) {
+          memberIds.courseProjectId = this.courseProjectId;
+        }
+        //查询当前会员下的所有项目疗程 如果有相对应的项目 就给courseAccountId赋值 没有的话 就是卡付现付
+        couAccountList(memberIds).then((res) => {
+          this.listLoading = false;
+          if (res.code == "000000") {
+            res.rows.forEach((item) => {
+              item.courseAccountId = item.id;
+            });
+            this.coureList = res.rows;
+          } else {
+            this.$alert(res.message, "查询会员疗程", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+          }
+        });
+      } else {
+        this.title = "选择门店项目";
+        propageNew(this.queryForm).then((res) => {
+          this.listLoading = false;
+          if (res.code == "000000") {
+            this.total = res.pageInfo.total;
+            this.list = res.pageInfo.list;
+          } else {
+            this.$alert(res.message, "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+          }
+        });
+      }
+    },
+    confirms() {
+      console.log("🚀 ~ file: index.vue ~ line 186 ~ confirms ~ this.isform", this.isform)
+      if (this.isform == 1 || this.isform == 0 || this.isform == 3) {
+        this.$emit("projectData", this.radioForm);
+      } else {
+        let froms = {}
+        froms.id=this.radio,
+        
+        froms.storeId=this.form.storeId
+        console.log("🚀 ~ file: index.vue ~ line 186 ~ confirms ~ froms", froms)
+        selectRatioInfo1(froms).then((res)=>{
+          if (res.code == "000000") {
+            this.rows=res.rows
+            // this.radioForm.rows=res.rows
+            this.$emit("projectData", this.radioForm,this.rows);
+            this.$message.success({ message: "操作成功" });
+          }else{
+            this.$alert(res.message, "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+          }
+        })
+      }
+      
+      this.dialogVisible = false;
+    },
+  },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/pages/storeManage/dept/components/detail.vue b/src/pages/storeManage/dept/components/detail.vue
index fc3635c..fbfeca9 100644
--- a/src/pages/storeManage/dept/components/detail.vue
+++ b/src/pages/storeManage/dept/components/detail.vue
@@ -41,7 +41,6 @@
     <orderdetail ref="orderdetail"></orderdetail>
     <span slot="footer" class="dialog-footer">
       <el-button size="mini" type="primary" @click="dialogVisible = false">关闭</el-button>
-      </el-button>
     </span>
   </el-dialog>
 </template>
@@ -101,6 +100,10 @@ export default {
           docType: "promotion",
           docTypeName: "促销活动",
         },
+        {
+          docType: "recharge_groupon",
+          docTypeName: "团购卡",
+        },
       ],
     };
   },