Signed-off-by: Changpeng Duan <838560574@qq.com>

app/src/page/login.vue

@@ -202,7 +202,8 @@
                 })
             },
             calcTime() {
-                let countdown = 5;
+                // 短信倒数计时
+                let countdown = 60;
                 let that = this;
                 //设置button效果，开始计时
                 that.getValidSmsState = true;
@@ -282,7 +283,7 @@
                 let s = 120;
                 if (betweenTime > s * 1000) {
                     that.changeValImg();
-                    that.$message.error('验证码已超时，请重新输入');
+                    that.$toast.message('验证码已超时，请重新输入');
                     return false
                 }
                 let param = {
@@ -341,7 +342,7 @@
                         localStorage.Insname = json.Rs.Insname;
                         that.$router.push({path: '/'});
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$toast.message(json.Memo);
                     }
                 })
             }

app/src/page/mainpage.vue

@@ -62,19 +62,22 @@
         destroyed() {
         },
         methods: {
-            getManagerSelfQuery(){
+            getManagerSelfQuery() {
                 let that = this;
                 let param = {
-                token: localStorage.token,
+                    token: localStorage.token,
                 };
                 let postdata = qs.stringify(param);
                 ManagerSelfQuery(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                        this.currShopId =  json.Rs.ShopId;
+                        this.currShopId = json.Rs.ShopId;
                         this.getList();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$toast.message(json.Memo);
+                        if (json.Code == 1010) {
+                            that.$router.push({path: '/login'});
+                        }
                     }
                 })
             },
@@ -92,7 +95,7 @@
                             that.shopNum = json.Rs.length;
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$toast.message(json.Memo);
                     }
                 })
             },

app/src/page/mine.vue

@@ -107,7 +107,7 @@
         methods: {
             logoutBtn() {
                 let that = this;
-                this.$confirm('是否退出当前账号？', '提示', {
+                this.$confirm('是否退出账号？', '提示', {
                     type: 'warning'
                 }).then(({result}) => {
                     if (result) {
@@ -130,7 +130,7 @@
                     if (json.Code == 0) {
                         that.user = json.Rs;
                     } else {
-                        that.$message.error(json.Memo);
+                      that.$toast.message(json.Memo);
                     }
                 })
             },
@@ -422,7 +422,9 @@
         padding: 0;
         font-size: 24px;
     }
-
+    /deep/ .mu-warning-text-color {
+        float: left;
+    }
     @media only screen and (max-width: 640px) {
 
     }

app/src/page/record.vue

@@ -191,7 +191,7 @@
                             that.num = json.Rs.length;
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$toast.message(json.Memo);
                     }
                 })
             },

pc/src/Global.js

@@ -277,6 +277,17 @@ turnResToOptionByCoach = function (data) {
     })
     return ids
 }
+turnResToOptionByUsers = function (data) {
+    if (!data) return false
+    let ids = data.map(item => {
+        return {
+            label: item.Name + ' ' + item.Phone,
+            key: parseInt(item.Id),
+            value: parseInt(item.Id),
+        }
+    })
+    return ids
+}
 
 turnClassResToOption = function (data) {
     if (!data) return false

pc/src/api/Navs.js

@@ -49,7 +49,7 @@ let navs = [{
     "clmname": "教练管理",
     "clmurl": "/coach",
     "prname": "",
-    "show": 3,
+    "show": 999,
     "grouplist": "2,5",
     "icon": "el-icon-medal-1",
 }, {

pc/src/api/getApiRes.js

@@ -349,6 +349,12 @@ export function SttPlanBasicAdd(postdata) {
     return getApiBasic(url, postdata);
 }
 
+// 课程表模板详情预览
+export function SttPlanPreview(postdata) {
+    let url = headapi + 'v1/SttPlan/SttPlanPreview';
+    return getApiBasic(url, postdata);
+}
+
 // 课程表模板基本信息修改
 export function SttPlanBasicEdit(postdata) {
     let url = headapi + 'v1/SttPlan/SttPlanBasicEdit';

pc/src/assets/css/panel.css

@@ -84,6 +84,7 @@
     background-color: #fff;
     margin-top: 0px;
     margin-bottom: 10px;
+    padding: 0!important;
 }
 
 .panel /deep/ .el-input {

pc/src/components/Navside.vue

@@ -21,7 +21,8 @@
                         active-text-color="#fff"
                         router
                 >
-                    <el-menu-item :index="nav.clmid" :route="nav.clmurl" v-for="nav in navs" v-if="nav.show == userLevel">
+                    <el-menu-item :index="nav.clmid" :route="nav.clmurl" v-for="nav in navs"
+                                  v-if="nav.show == userLevel">
                         <i :class="nav.icon"></i>
                         <span slot="title">{{nav.clmname}}</span>
                     </el-menu-item>
@@ -62,22 +63,35 @@
                 // 菜单
                 this.navs = Navs;
             },
-            getManagerSelfQuery(){
+            getManagerSelfQuery() {
                 let that = this;
                 let param = {
-                token: localStorage.token,
+                    token: localStorage.token,
                 };
                 let postdata = qs.stringify(param);
                 ManagerSelfQuery(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
                         that.userLevelText = json.Rs.Role.Name;
-                        // 1 会员 2 系统 3 店铺
-                        that.userLevel = json.Rs.Role.Id;
+                        // 1 会员 2 系统 3 店铺 4 教练
+                        switch (parseInt(json.Rs.Role.Id)) {
+                            case 1:
+                                that.userLevel = 1;
+                                break;
+                            case 2:
+                                that.userLevel = 2;
+                                break;
+                            case 3:
+                                that.userLevel = 3;
+                                break;
+                            case 4:
+                                that.userLevel = 3;
+                                break;
+                        }
                         localStorage.shopId = json.Rs.ShopId;
                         this.panelSelect(json.Rs.ShopId);
                     } else {
-                        if(json.Code == 1010){
+                        if (json.Code == 1010) {
                             that.$message.error(json.Memo);
                             that.$router.push({path: '/login', query: {status: 1}});
                             return false
@@ -87,7 +101,7 @@
                 })
             },
             // 获取所属店铺
-            panelSelect(ShopId){
+            panelSelect(ShopId) {
                 let that = this;
                 let param = {
                     token: localStorage.token,
@@ -96,12 +110,12 @@
                 ShopListQuery(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                       json.Rs.map(function (item) {
-                            if(item.ShopID ==  ShopId){
+                        json.Rs.map(function (item) {
+                            if (item.ShopID == ShopId) {
                                 that.ShopName = item.ShopName;
                                 console.log(item.ShopName);
                             }
-                       })
+                        })
                     } else {
                         that.$message.error(json.Memo);
                     }
@@ -115,8 +129,8 @@
             },
         },
         watch: {
-            $route(to,from){
-              this.userLevelDeafult = to.meta.clmid
+            $route(to, from) {
+                this.userLevelDeafult = to.meta.clmid
             },
         },
     }
@@ -134,6 +148,7 @@
         background-color: #fff;
         z-index: 4444;
     }
+
     .logoContainer {
         width: 256px;
         height: 72px;
@@ -142,6 +157,7 @@
         margin: 0 auto;
         background: #3799FF;
     }
+
     .logoContainer img {
         width: 100%;
         height: 100%;
@@ -150,6 +166,7 @@
         margin: 0 auto;
         margin-top: 1px;
     }
+
     .userContainer {
         width: 100%;
         overflow: hidden;
@@ -161,12 +178,14 @@
         border-bottom: 1px solid #F0F2F5;
         background: #fff;
     }
+
     .userContainer img {
         overflow: hidden;
         display: block;
         margin: 0 auto;
         margin-bottom: 16px;
     }
+
     .userContainer span {
         width: 100%;
         overflow: hidden;
@@ -175,6 +194,7 @@
         color: #565656;
         font-size: 16px;
     }
+
     .userContainer em {
         width: 125px;
         height: 26px;
@@ -189,28 +209,35 @@
         font-style: normal;
         margin-top: 8px;
     }
+
     /deep/ .el-menu {
         border: none;
     }
+
     /deep/ .el-menu-item {
     }
+
     /deep/ .el-menu-item span {
         text-align: left;
         float: left;
         margin-left: 70px;
     }
+
     /deep/ .el-menu-item.is-active {
-        background-color:#3799FF!important;
-        color: #fff!important;
+        background-color: #3799FF !important;
+        color: #fff !important;
     }
+
     /deep/ .el-menu-item:hover {
-        background-color:#3799FF!important;
-        color: #fff!important;
+        background-color: #3799FF !important;
+        color: #fff !important;
     }
+
     /deep/ .el-menu-item:hover i {
-        color: #fff!important;
+        color: #fff !important;
     }
-    /deep/ .el-menu-item i{
+
+    /deep/ .el-menu-item i {
         position: relative;
         float: left;
         line-height: 55px;

pc/src/views/AdminManage.vue

@@ -24,6 +24,17 @@
                                 </el-option>
                             </el-select>
                         </el-col>
+                        <el-col :span="4">
+                            <em>类型:</em>
+                            <el-select v-model="panel.adminType">
+                                <el-option
+                                        v-for="item in panel.typeList"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-col>
                         <el-col :span="4">
                             <el-button size="" type="primary" @click="query" plain>查询</el-button>
                         </el-col>
@@ -32,7 +43,7 @@
             </div>
         </div>
         <div class="change">
-            <el-button @click="addAdmin">新增管理员</el-button>
+            <el-button @click="addAdmin">新增</el-button>
             <el-button @click="editList">编辑</el-button>
             <el-button @click="delList">删除</el-button>
         </div>
@@ -72,6 +83,19 @@
                         label="手机号"
                 >
                 </el-table-column>
+                <el-table-column
+                        prop="AdminType "
+                        label="角色"
+                >
+                    <template slot-scope="scope">
+<!--                        // 1 会员 2 系统 3 店铺 4 教练-->
+                        <span v-if="scope.row.AdminType  == 1" style="color: #005EA2">会员</span>
+                        <span v-if="scope.row.AdminType  == 2" style="color: green">系统管理员</span>
+                        <span v-if="scope.row.AdminType  == 3" style="color: #8c939d">店铺管理员</span>
+                        <span v-if="scope.row.AdminType  == 4">教练</span>
+                    </template>
+                </el-table-column>
+
                 <el-table-column
                         prop="ShopName"
                         label="所属门店"
@@ -151,6 +175,16 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="用户角色">
+                        <el-select v-model="form.adminType " placeholder="请选择用户角色">
+                            <el-option
+                                    v-for="item in form.adminTypeList"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="备注">
                         <el-input v-model="form.memo"></el-input>
                     </el-form-item>
@@ -182,7 +216,7 @@
         data() {
             return {
                 dialogVisible: false,
-                dialogTitle: '新增管理员',
+                dialogTitle: '新增',
                 // panel 配置项目
                 panel: {
                     userCode: '',
@@ -202,6 +236,13 @@
                     multipleSelection: [],
                     detectedmac: '',
                     time1: globalBt(),
+                    type: ' ',
+                    adminType: '',
+                    typeList: [
+                        {value: '', label: '全部'},
+                        {value: 3, label: '店铺管理员'},
+                        {value: 4, label: '教练'},
+                    ],
                 },
                 multipleSelection: [],
                 pageination: {
@@ -219,13 +260,17 @@
                     phone: '',
                     memo: '',
                     btnState: 0,
+                    adminType: 3,
+                    adminTypeList: [
+                        {value: 3, label: '店铺管理员'},
+                        {value: 4, label: '教练'},
+                    ],
                 },
                 shops: [],
                 tableData: []
             }
         },
         mounted() {
-            this.panelSelect();
             this.getTableQuery();
         },
         methods: {
@@ -283,6 +328,7 @@
                     password: that.form.password,
                     name: that.form.name,
                     phone: that.form.phone,
+                    adminType: that.form.adminType,
                     memo: that.form.memo,
                 };
                 let postdata = qs.stringify(param);
@@ -390,6 +436,10 @@
                 ShopListQuery(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
+                        if(json.Rs == ''){
+                            that.$message.error('当前没有可选的店铺，请先在店面管理中添加店铺!');
+                            return false
+                        }
                         that.panel.options = turnShopResToOption(json.Rs);
                         that.shops = turnShopResToOption(json.Rs);
                         that.form.shopId = json.Rs[0].ShopID;
@@ -420,11 +470,11 @@
                     return false
                 }
 
-                let userId  = that.multipleSelection[0].Id;
+                let userId = that.multipleSelection[0].Id;
 
                 let param = {
                     token: localStorage.token,
-                    userId : userId ,
+                    userId: userId,
                     status: 9,//0禁用1启用9删除
                 };
                 let postdata = qs.stringify(param);
@@ -480,7 +530,7 @@
             },
             clearForm() {
                 // clear
-                this.form.shopId = this.shops[0].value;
+                this.form.shopId = 0;
                 this.form.name = '';
                 this.form.userCode = '';
                 this.form.password = '';
@@ -493,7 +543,7 @@
                 // 重载店面列表
                 this.panelSelect();
                 this.dialogVisible = true
-                this.dialogTitle = '新增管理员'
+                this.dialogTitle = '新增'
                 this.form.btnState = 0;
             },
             // 编辑管理员
@@ -527,8 +577,9 @@
                 this.form.password = '';
                 this.form.phone = row.Phone;
                 this.form.memo = row.Memo;
+                this.form.adminType = row.AdminType;
                 this.dialogVisible = true
-                this.dialogTitle = '编辑管理员'
+                this.dialogTitle = '编辑'
                 this.form.btnState = 1;
             },
             handleSelectionChange(val) {
@@ -548,6 +599,7 @@
                     shopId: this.panel.shopId,
                     name: this.panel.name,
                     phone: this.panel.phone,
+                    adminType: this.panel.adminType,
                     start: 1,//
                     tableMax: 9999,//
                 };
@@ -622,14 +674,22 @@
                 return parseFloat(column).toFixed(2);
             },
         },
+        watch: {
+            $route(to) {
+                if (to.name == 'AdminManage') {
+                    this.getTableQuery();
+                }
+            },
+        },
     }
 </script>
 
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 770px;
-         overflow-y: scroll;
+    .context {
+        height: 770px;
+        overflow-y: scroll;
 
         display: block;
         margin: 0 auto;
@@ -693,12 +753,15 @@
         float: right;
         margin-left: 10px;
     }
+
     /deep/ .el-dialog .el-select .el-input__inner {
         width: 240px;
     }
+
     /deep/ .el-dialog .el-select {
         width: 530px;
     }
+
     /deep/ .el-dialog .el-select .el-input__inner {
         width: 530px;
     }

pc/src/views/EditLessonManage.vue

@@ -211,7 +211,7 @@
                 tableData: [],
                 // panel 配置项目
                 panel: {
-                    inputState: true,
+                    inputState: false,
                     name: '',
                     usercode: '',
                     username: '',
@@ -287,10 +287,12 @@
                 this.deepValue();
                 this.panel.name = '';
                 this.panel.week = '';
+                this.panel.inputState = false
             } else {
                 // 读取赋值
                 this.pageTitle = '编辑课程表'
                 this.getTableQuery();
+                this.panel.inputState = true
             }
         },
         methods: {
@@ -454,6 +456,9 @@
                         });
                         // this.getTableQuery();
                     } else {
+                        this.$router.push({
+                            path: '/lessonManage'
+                        });
                         that.$message.error(json.Memo);
                     }
                 })
@@ -523,7 +528,6 @@
                     stbId: this.$route.query.id,//
                 };
                 // 只能读取，不能修改
-                this.panel.inputState = true;
                 this.panel.name = this.$route.query.name;
 
 

pc/src/views/EditLessonTable.vue

@@ -223,7 +223,8 @@
                     {
                         tableData: [], days: '7'
                     },
-                ]
+                ],
+                DataAssemblyRs:[]
             }
         },
         mounted() {
@@ -331,6 +332,11 @@
                     this.$message.error('模板名称不能大于20个字符');
                     return false
                 }
+                // if (!this.checkData()){
+                //     return false
+                // }
+                // console.log('准备完毕了');
+                // return false
                 let that = this;
                 let param = {
                     token: localStorage.token,
@@ -348,6 +354,27 @@
                     }
                 })
             },
+            // 数据组装
+            DataAssembly(){
+                let thisRow = {};
+                for (let i = 0; i < this.tabs.length; i++) {
+                    for (let j = 0; j < this.tabs[i].tableData.length; j++) {
+                        thisRow = this.tabs[i].tableData[j];
+                        thisRow.lessonIndex = parseInt(j);
+                        if (planId) {
+                            thisRow.PlanId = parseInt(planId);
+                        } else {
+                            thisRow.PlanId = parseInt(this.$route.query.id);
+                        }
+                        thisRow.WeekDay = parseInt(i + 1);
+                        thisRow.BeginStr = getHoursAndMin(thisRow.timeLong[0]);
+                        thisRow.EndStr = getHoursAndMin(thisRow.timeLong[1]);
+                        this.$delete(thisRow, 'Base');
+                        this.$delete(thisRow, 'SpdId');
+                        this.DataAssemblyRs.push(thisRow)
+                    }
+                }
+            },
             // 修改课程模板
             EditLessonTable(planId) {
                 let that = this;
@@ -384,8 +411,6 @@
                 };
                 let postdata = qs.stringify(param);
                 // 得等数组装完才能校验
-                this.checkData(planRs).then(result => {
-                    console.log(result);
                     SttPlanDetailBatchSave(postdata).then(res => {
                         let json = res;
                         if (json.Code == 0) {
@@ -399,15 +424,19 @@
                             });
                             // this.getTableQuery();
                         } else {
+                            this.$router.push({
+                                path: '/lessonTable'
+                            });
                             that.$message.error(json.Memo);
                         }
                     })
-                })
             },
             // 检查数据
-            checkData: async function(planRs) {
+            checkData() {
+                // 目前报错规则：StbId  WeekDay ClassId 不能为空为 0 BeginStr EndStr 必须是5位数字符串
                 let that = this;
-                let tableDate = planRs;
+                this.DataAssembly();
+                let tableDate = this.DataAssemblyRs;
                 tableDate.map(function (item) {
                     if (!item.ClassId) {
                         let days = numberToWeekdays(item.WeekDay);

pc/src/views/Lesson.vue

@@ -724,6 +724,14 @@
                 return nonTfmtDate(column, 11);
             },
         },
+        watch: {
+            $route(to) {
+                if (to.name == 'Lesson') {
+                    this.panelSelect();
+                    this.getTableQuery();
+                }
+            },
+        },
     }
 </script>
 

pc/src/views/LessonTable.vue

@@ -79,7 +79,7 @@
                 >
                     <template slot-scope="scope">
                         <el-button type="text" @click="goEdit(scope.row)">编辑</el-button>
-                        <el-button type="text" @click="goEdit(scope.row)">预览本周</el-button>
+                        <el-button type="text" @click="seeWeek(scope.row)">预览本周</el-button>
                         <el-button type="success" size="mini" @click="openLessonTable(scope.row)">发布
                         </el-button>
                     </template>
@@ -142,10 +142,10 @@
                 <el-button @click="dialogVisible = false" size="small">取消</el-button>
             </div>
         </el-dialog>
-        <el-dialog title="预览本周" :visible.sync="previewVisible" width="1200px">
-            <preview></preview>
+        <el-dialog title="预览本周" :visible.sync="previewShow" width="1200px">
+            <preview  :preview-date="previewDate" :big-title="BigTitle" :small-title="smallTitle" ></preview>
             <div class="dialogFooter">
-                <el-button @click="previewVisible = false" size="small">关闭</el-button>
+                <el-button @click="previewShow = false" size="small">关闭</el-button>
             </div>
         </el-dialog>
 
@@ -162,6 +162,7 @@
         SttPlanBasicStatusEdit,
         SttPlanCopy,
         SttPlanPublish,
+        SttPlanPreview,
         testTable,
         testSelect,
     } from "../api/getApiRes";
@@ -170,6 +171,10 @@
     export default {
         data() {
             return {
+                previewShow: false,
+                previewDate: {},
+                BigTitle: '',
+                smallTitle: '',
                 dialogVisible: false,
                 dialogCopyVisible: false,
                 previewVisible: false,//todo
@@ -201,6 +206,28 @@
             this.getTableQuery();
         },
         methods: {
+            seeWeek(row) {
+                let that = this;
+
+                let param = {
+                    token: localStorage.token,
+                    planId: row.PlanId,
+                };
+                let postdata = qs.stringify(param);
+                SttPlanPreview(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.BigTitle = row.PlanName;
+                        that.smallTitle = ' ';
+                        that.previewDate = json.Rs;
+                        // 前台排序
+                        that.previewDate.SttPlanPreviewClassList.sort((a,b)=>a.ClassIndex-b.ClassIndex);//升序
+                        that.previewShow = true;
+                    } else {
+                        that.$message.error(json.Memo);
+                    }
+                })
+            },
             // 通用修改
             changeShopId(e, row) {
                 console.log(e);

pc/src/views/Log.vue

@@ -110,32 +110,6 @@
             ></el-pagination>
         </div>
 
-        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="360px">
-            <div>
-                <el-form ref="form" :model="form" label-width="80px">
-                    <el-form-item label="手机号">
-                        <el-input v-model="form.userCode"></el-input>
-                    </el-form-item>
-                    <el-form-item label="姓名">
-                        <el-input v-model="form.name"></el-input>
-                    </el-form-item>
-                    <el-form-item label="所属门店">
-                        <el-select v-model="form.shopId" placeholder="请选择所属门店">
-                            <el-option
-                                    v-for="item in shops"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <div class="dialogFooter">
-                <el-button type="primary" size="small" @click="confirmAdmin">确定</el-button>
-                <el-button @click="dialogVisible = false" size="small">取消</el-button>
-            </div>
-        </el-dialog>
     </div>
 </template>
 
@@ -196,50 +170,6 @@
             this.getTableQuery();
         },
         methods: {
-            // 新增 确认提交
-            confirmAdmin() {
-                let that = this;
-                // checkNum
-                if (!that.form.userCode) {
-                    this.$message.error('错了哦，手机号不能为空');
-                    return false
-                }
-                if (!globalCheckPhone(that.form.userCode)) {
-                    this.$message.error('错了哦，手机号格式不正确');
-                    return false
-                }
-                if (!that.form.name) {
-                    this.$message.error('错了哦，姓名不能为空');
-                    return false
-                }
-                if (that.form.name.length > 8) {
-                    this.$message.error('错了哦，姓名字数超过8个字');
-                    return false
-                }
-                let param = {
-                    token: localStorage.token,
-                    userCode: that.form.userCode,
-                    name: that.form.name,
-                    shopid: that.form.shopid,
-                };
-                let postdata = qs.stringify(param);
-                testSelect(postdata).then(res => {
-                    let json = res;
-                    if (json.Code == 0) {
-                        // 关闭弹窗
-                        that.dialogVisible = false;
-                        // 重载列表
-                        that.getTableQuery();
-                        that.$message({
-                            showClose: true,
-                            message: '管理员添加成功！',
-                            type: 'success'
-                        });
-                    } else {
-                        that.$message.error(json.Memo);
-                    }
-                })
-            },
             // 加载选项
             panelSelect() {
                 let that = this;
@@ -271,82 +201,12 @@
                 })
                 return ids
             },
-            // 删除
-            delList() {
-                let that = this;
-                // checkNum
-                if (!this.multipleSelection.length) {
-                    that.$message({
-                        showClose: true,
-                        message: '错了哦，需要先选中至少一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-                if (this.multipleSelection.length != 1) {
-                    that.$message({
-                        showClose: true,
-                        message: '错了哦，只能选中一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-                let detectorid = that.multipleSelection[0].Id;
-
-                let param = {
-                    token: localStorage.token,
-                    detectorid: detectorid,
-                    status: 9,//0禁用1启用9删除
-                };
-                let postdata = qs.stringify(param);
-
-                this.$confirm('此操作将永久删除该管理员, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    testSelect(postdata).then(res => {
-                        let json = res;
-                        if (json.Code == 0) {
-                            that.$message({
-                                showClose: true,
-                                message: '选中的管理员已删除！',
-                                type: 'success'
-                            });
-                            // 重载列表
-                            that.getTableQuery();
-                        } else {
-                            that.$message.error(json.Memo);
-                        }
-                    });
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消删除'
-                    });
-                });
-            },
             clearForm() {
                 // clear
                 this.form.name = '';
                 this.form.userCode = '';
                 this.form.shopId = '';
             },
-            // 新增管理员
-            addAdmin() {
-                this.clearForm();
-                this.dialogVisible = true
-                this.dialogTitle = '新增管理员'
-            },
-            // 编辑管理员
-            editList(row) {
-                this.clearForm();
-                this.form.name = row.name;
-                this.form.userCode = row.userCode;
-                this.form.shopId = row.Id;
-                this.dialogVisible = true
-                this.dialogTitle = '编辑管理员'
-            },
             handleSelectionChange(val) {
                 this.multipleSelection = val;
             },
@@ -367,8 +227,8 @@
                     name: this.panel.name,
                     phone: this.panel.phone,
                     userId: this.panel.userId,
-                    bt: nonTfmtDate(that.panel.timeScope[0], 10),
-                    et: nonTfmtDate(that.panel.timeScope[1], 10),
+                    bt: nonTfmtDatetoLength(that.panel.timeScope[0], 10)+" 00:00:00",
+                    et: nonTfmtDatetoLength(that.panel.timeScope[1], 10)+" 23:59:59",
                     start: 1,//
                     tableMax: 9999,//
                 };

pc/src/views/Login.vue

@@ -126,7 +126,7 @@
                     let json = res;
                     if (json.Code == 0) {
                         that.userLevelText = json.Rs.Role.Name;
-                        // 1 会员 2 系统 3 店铺
+                        // 1 会员 2 系统 3 店铺 4 教练
                         that.userLevel = json.Rs.Role.Id;
                         localStorage.shopId = json.Rs.ShopId;
                         localStorage.ShopId = json.Rs.ShopId;
@@ -141,6 +141,9 @@
                             case 3:
                                 that.$router.push({path: '/'});
                                 break;
+                            case 4:
+                                that.$router.push({path: '/'});
+                                break;
 
                         }
                     } else {

pc/src/views/Main.vue

@@ -112,7 +112,7 @@
         <div class="rt">
             <div class="rtContext">
                 <div class="rtTitle">
-                    <h5>最新预约</h5>
+                    <h5>今日预约</h5>
                     <span @click="goPage('appoint')">查看全部</span>
                 </div>
                 <ul>

pc/src/views/Member.vue

@@ -182,7 +182,7 @@
             ></el-pagination>
         </div>
 
-        <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" width="1200px">
+        <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" :width="form.btnType == 1 ?'650px':'1200px'">
             <div class="dialogContent">
                 <div :class="['pull-left',{'tabwild':form.btnType == 1},]">
                     <el-form ref="form" :model="form" label-width="160px">
@@ -240,7 +240,7 @@
                     <br>
                     <br>
                     <span v-if="dialogLesson">当前课时</span>
-                    <span v-if="dialogGift">当前赠送课时</span>
+                    <span v-if="dialogGift">赠送课时</span>
                     <span v-if="dialogExpTime">当前到期时间</span>
                     <span v-if="dialogLessonTable">当前会员课程</span>
                 </h5>
@@ -516,7 +516,7 @@
                     return false
                 }
                 let row = this.multipleSelection[0];
-                this.form.normalhour = row.UserInfo.RemainNormalhour;
+                this.form.normalhour = 0;
                 this.form.rowName = row.UserInfo.Name;
                 this.form.userId = row.UserInfo.Id;
                 this.dialogVisible = true;
@@ -543,7 +543,8 @@
                     return false
                 }
                 let row = this.multipleSelection[0];
-                this.form.gifthour = row.UserInfo.RemainGifthour;
+                // this.form.gifthour = row.UserInfo.RemainGifthour;
+                this.form.gifthour = 0;
                 this.form.rowName = row.UserInfo.Name;
                 this.form.userId = row.UserInfo.Id;
                 this.dialogVisible = true;
@@ -904,8 +905,13 @@
             clearForm() {
                 // clear
                 this.form.name = '';
+                this.form.phone = '';
+                this.form.memo = '';
+                this.form.normalhour = 0;
+                this.form.gifthour = 0;
                 this.form.userCode = '';
                 this.form.shopId = '';
+                this.form.classlist = [];
             },
             // 页面数据查询
             getTableQuery() {
@@ -988,6 +994,16 @@
                 }
             },
         },
+        watch: {
+            $route(to) {
+                if (to.name == 'Member') {
+                    // 加载课程选项
+                    this.panelSelect();
+                    // 读取列表
+                    this.getTableQuery();
+                }
+            },
+        },
     }
 </script>
 

pc/src/views/appoint.vue

@@ -188,13 +188,11 @@
                             >
                             </el-table-column>
                             <el-table-column
-                                    prop="CurrentDate"
+                                    prop="OrderCreateTime"
                                     label="会员预约时间"
+                                    :formatter="filterFmtDate"
                                     sortable
                             >
-                                <template slot-scope="scope">
-                                    {{scope.row.CurrentDate}} {{scope.row.BeginStr}}
-                                </template>
                             </el-table-column>
                             <el-table-column
                                     prop="ConsumeHour"
@@ -467,7 +465,7 @@
                         if(item.value == stdId){
                             let param = {
                                 token: localStorage.token,
-                                classId:item.ClassId
+                                classId:item.classId
                             };
                             let postdata = qs.stringify(param);
                             // VipUserListQuery
@@ -1513,12 +1511,16 @@
         float: left;
     }
     /deep/ .el-progress__text {
+        position: relative;
+        top:1px;
         float: right;
-        line-height: 10px;
+        line-height: 14px;
+        height: 16px;
     }
     /deep/ .el-progress-bar {
         width: 190px;
         float: left;
         overflow: hidden;
+        margin-top: 5px;
     }
 </style>

pc/src/views/cost.vue

@@ -949,6 +949,14 @@
                 return parseFloat(column).toFixed(2);
             },
         },
+        watch: {
+            $route(to) {
+                if (to.name == 'cost') {
+                    this.panelSelect();
+                    this.getTableQuery();
+                }
+            },
+        },
     }
 </script>
 

pc/src/views/finishDetail.vue

@@ -135,6 +135,7 @@
         testTable,
         testSelect,
         TeacherListQuery,
+        ShopManagerListQuery,
         ClassOverDetailDel
     } from "../api/getApiRes";
 
@@ -224,7 +225,7 @@
             this.ClassName = this.$route.query.ClassName;
             this.getTableQuery();
             // 获取教练选项
-            this.getCoachOption();
+            // this.getCoachOption();
         },
         methods: {
             // 获取教练选项
@@ -234,13 +235,16 @@
                     token: localStorage.token,
                     name: this.panel.name,//
                     phone: this.panel.phone,//
+                    shopId: localStorage.ShopId,//
+                    adminType : 4,//
+                    start : 1,//
+                    tableMax  : 299,//
                 };
                 let postdata = qs.stringify(param);
-                TeacherListQuery(postdata).then(res => {
+                ShopManagerListQuery(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                        console.log(json.Rs);
-                        that.form.dialogCoachdata = turnResToOptionByCoach(json.Rs);
+                        that.form.dialogCoachdata = turnResToOptionByUsers(json.Rs);
                     } else {
                         that.$message.error(json.Memo);
                     }

pc/src/views/lessonManage.vue

@@ -151,6 +151,10 @@
                 <span class="demonstration">选择发布日期(按周选取)</span>
                 <br>
                 <br>
+<!--                todo 禁用当前周以前的选项  disabledDate(date) {
+   return date.getTime() <= Date.now()-86400000;
+ }
+-->
                 <el-date-picker
                         v-model="copyForm.week"
                         type="week"
@@ -175,24 +179,36 @@
                 <el-button @click="dialogNameVisible = false" size="small">取消</el-button>
             </div>
         </el-dialog>
+        <el-dialog title="预览本周" :visible.sync="previewShow" width="1200px">
+            <preview  :preview-date="previewDate" :big-title="BigTitle" :small-title="smallTitle" ></preview>
+            <div class="dialogFooter">
+                <el-button @click="previewShow = false" size="small">关闭</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
     import Global from '../Global.js'
+    import preview from '../components/preview'
     import {
         STTBasicListQuery,
         STTBasicOfflineEdit,
         STTBasicStatusEdit,
         SchoolTimeTableCopy,
         STTBasicEdit,
-        testSelect
+        testSelect,
+        SttPlanPreview,
     } from "../api/getApiRes";
 
     let qs = require('qs');
     export default {
         data() {
             return {
+                previewShow: false,
+                previewDate: {},
+                BigTitle: '',
+                smallTitle: '',
                 dialogVisible: false,
                 dialogCopyVisible: false,
                 dialogNameVisible: false,
@@ -235,8 +251,27 @@
                 this.dialogNameVisible = true;
             },
             // 预览本周
-            seeWeek() {
-                console.log(123);
+            seeWeek(row) {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                    // planId: row.PlanId,
+                    planId: 26,
+                };
+                let postdata = qs.stringify(param);
+                SttPlanPreview(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.BigTitle = row.Name;
+                        that.smallTitle = row.BeginDate + '-----' + row.EndDate;
+                        that.previewDate = json.Rs;
+                        // 前台排序
+                        that.previewDate.SttPlanPreviewClassList.sort((a,b)=>a.ClassIndex-b.ClassIndex);//升序
+                        that.previewShow = true;
+                    } else {
+                        that.$message.error(json.Memo);
+                    }
+                })
             },
             addLessonTable() {
                 this.$router.push({
@@ -589,6 +624,16 @@
                 })
             },
         },
+        watch: {
+            $route(to) {
+                if (to.name == 'lessonManage') {
+                    this.getTableQuery();
+                }
+            },
+        },
+        components: {
+            preview
+        }
     }
 </script>
 

pc/src/views/record.vue

@@ -96,7 +96,7 @@
                 >
                 </el-table-column>
                 <el-table-column
-                        prop="CurrentDate"
+                        prop="OrderCreateTime"
                         label="预约日期"
                         width="180"
                         :formatter="filterFmtDate"
@@ -110,7 +110,6 @@
                         sortable
                 >
                     <template slot-scope="scope">
-
                         {{ scope.row.BeginTime |filterNoTTime}} - {{scope.row.EndStr}}
                     </template>
                 </el-table-column>
@@ -356,7 +355,15 @@
                     return nonTfmtDatetoLength(value,16);
                 }
             },
-        }
+        },
+        watch: {
+            $route(to) {
+                if (to.name == 'record') {
+                    this.panelSelect();
+                    this.getTableQuery();
+                }
+            },
+        },
     }
 </script>