ソースを参照

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

Changpeng Duan 5 年 前
コミット
9e54769533

+ 4 - 2
app/src/page/record.vue

@@ -60,7 +60,7 @@
                         <p v-if="active == 0 && list == ''">
                             暂无已预约
                         </p>
-                        <p v-if="active == 1 && list == ''">
+                        <p v-if="active == 1 && list == null">
                             暂无预约记录
                         </p>
                         <p v-if="active == 2 && list == ''">
@@ -169,6 +169,8 @@
                             that.list = json.Rs;
                             if (that.list) {
                                 that.num = json.Rs.length;
+                            }else{
+                                that.num = 0
                             }
                         } else {
                             that.Toast(json.Memo + ',错误码:' + json.Code);
@@ -208,7 +210,7 @@
                         break;
                     // 预约记录
                     case 1:
-                        statusList = '1,2,3,4';
+                        statusList = '2,3,4';
                         this.getOrderListQuery(statusList);
                         break;
                     // 消费记录

+ 19 - 9
app2/src/pages/login.vue

@@ -1,16 +1,8 @@
 <template>
   <div id="pages">
-    <div class="main bg bg01" v-if="page == 0">
+    <div class="main bg bg01" :style="{ height: bodyHeight + 'px' }">
       <h5><img id="logo" src="../../static/images/login/logo.png" alt=""></h5>
       <p><img id="title" src="../../static/images/login/title.png" alt=""></p>
-
-<!--        <mt-field placeholder="手机号" v-model="pwd_login.usercode"></mt-field>-->
-<!--        <mt-field placeholder="获取验证码" v-model="pwd_login.usercode"></mt-field>-->
-
-<!--        <mt-field placeholder="图形验证" v-model="pwd_login.img_valid" v-if="step > 0"-->
-<!--                  @keyup.enter.native="pwd_login_confirm">-->
-<!--          <img :src="valImgSrc" @click="changeValImg" height="23" width="55">-->
-<!--        </mt-field>-->
         <ul class="white_cube" >
           <li class="form-group">
             <input type="text" class="form-control" id="sms_username" placeholder="请输入手机号"
@@ -361,6 +353,21 @@
   @import "../assets/css/comm.css";
 
   #pages {
+    /*position: absolute;*/
+    /*top: 0;*/
+    /*left: 0;*/
+    /*right: 0;*/
+    /*bottom: 0;*/
+    /*width: 100%;*/
+    /*height: 100%;*/
+    /*overflow: hidden;*/
+    /*display: block;*/
+    /*margin: 0 auto;*/
+    /*background: url("../../static/images/login/bg.png") top center no-repeat;*/
+    /*background-size: 100% 100%;*/
+  }
+
+  .main {
     position: absolute;
     top: 0;
     left: 0;
@@ -402,6 +409,9 @@
     overflow: hidden;
     display: block;
     margin: 0 auto;
+    height: 100%;
+    background: url('../assets/images/bg@2x.png') no-repeat left top;
+    background-size: 100% 100%;
   }
 
   /deep/ .mint-cell {

+ 27 - 45
pc/src/views/AdminManage.vue

@@ -55,11 +55,15 @@
                     :default-sort="{prop: 'date', order: 'descending'}"
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
-                    @selection-change="handleSelectionChange"
-            >
-                <el-table-column
-                        type="selection"
-                        width="55">
+                    @selection-change="handleSelectionChange" @current-change="clickChange"
+            > @current-change="clickChange"
+                >
+                @current-change="clickChange"
+                >
+                <el-table-column label="选择" width="55">
+                    <template slot-scope="scope">
+                        <el-radio v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         type="index"
@@ -90,7 +94,7 @@
                         label="角色"
                 >
                     <template slot-scope="scope">
-<!--                        // 1 会员 2 系统 3 店铺 4 教练-->
+                        <!--                        // 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>
@@ -269,13 +273,17 @@
                     ],
                 },
                 shops: [],
-                tableData: []
+                tableData: [],
+                tableRadio: []
             }
         },
         mounted() {
             this.getTableQuery();
         },
         methods: {
+            clickChange(item) {
+                this.tableRadio = item
+            },
             // 新增 确认提交
             confirmAdmin() {
                 let that = this;
@@ -438,7 +446,7 @@
                 ShopListQuery(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                        if(json.Rs == ''){
+                        if (json.Rs == '') {
                             that.$message.error('当前没有可选的店铺,请先在店面管理中添加店铺!');
                             return false
                         }
@@ -454,25 +462,11 @@
             // 删除
             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'
-                    });
+                if (this.tableRadio.length == 0) {
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-
-                let userId = that.multipleSelection[0].Id;
+                let userId = this.tableRadio.Id;
 
                 let param = {
                     token: localStorage.token,
@@ -544,8 +538,8 @@
                 this.clearForm();
                 // 重载店面列表
                 this.panelSelect();
-                this.dialogVisible = true
-                this.dialogTitle = '新增'
+                this.dialogVisible = true;
+                this.dialogTitle = '新增';
                 this.form.btnState = 0;
             },
             // 编辑管理员
@@ -554,24 +548,12 @@
                 this.clearForm();
                 // 重载门店列表
                 this.panelSelect();
-                // 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'
-                    });
+                console.log(this.tableRadio);
+                if (this.tableRadio.length == 0) {
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                let row = that.multipleSelection[0];
+                let row = this.tableRadio;
                 this.form.shopid = row.ShopId;
                 this.form.userId = row.Id;
                 this.form.name = row.Name;
@@ -580,8 +562,8 @@
                 this.form.phone = row.Phone;
                 this.form.memo = row.Memo;
                 this.form.adminType = row.AdminType;
-                this.dialogVisible = true
-                this.dialogTitle = '编辑'
+                this.dialogVisible = true;
+                this.dialogTitle = '编辑';
                 this.form.btnState = 1;
             },
             handleSelectionChange(val) {

+ 2 - 1
pc/src/views/EditLessonManage.vue

@@ -50,6 +50,7 @@
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
                     @selection-change="handleSelectionChange"
+>
             >
                 <el-table-column
                         prop="timeScope"
@@ -147,7 +148,7 @@
                 >
                     <template slot-scope="scope">
                         <el-button type="text" class="red" @click="delRow(scope)" v-if="scope.row.Locking != 1">删除</el-button>
-                        <el-button type="text" class="gary"  v-else @click="delRow(scope)" v-if="scope.row.Locking == 1">删除</el-button>
+                        <el-button type="text" class="gary" @click="delRow(scope)" v-if="scope.row.Locking == 1">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>

+ 1 - 0
pc/src/views/EditLessonTable.vue

@@ -39,6 +39,7 @@
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
                     @selection-change="handleSelectionChange"
+>
             >
                 <el-table-column
                         prop="timeScope"

+ 2 - 1
pc/src/views/EditLessonTable2.vue

@@ -32,7 +32,8 @@
                     :default-sort="{prop: 'date', order: 'descending'}"
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
-                    @selection-change="handleSelectionChange"
+                    @selection-change="handleSelectionChange"                                   @current-change="clickChange"
+>
             >
                 <el-table-column
                         prop="timeScope"

+ 9 - 7
pc/src/views/Equip.vue

@@ -45,13 +45,15 @@
                 v-loading="loading"
                 element-loading-background="rgba(0, 0, 0, 0.8)"
                 class=""
-                @selection-change="handleSelectionChange"
+                @selection-change="handleSelectionChange"                                   @current-change="clickChange"
+>
                 stripe
         >
-            <el-table-column
-                    type="selection"
-                    width="55">
-            </el-table-column>
+            <el-table-column label="选择" width="55">
+    <template slot-scope="scope">
+        <el-radio  v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+    </template>
+</el-table-column>
             <el-table-column
                     type="index"
                     label="序号"
@@ -544,7 +546,7 @@
                     });
                     return false
                 }
-                let detectorid = that.multipleSelection[0].Id;
+                let detectorid = that.tableRadio;.Id;
 
                 let param = {
                     token: localStorage.token,
@@ -604,7 +606,7 @@
                 this.dialog_type = 2;
 
                 // 读取本条记录
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 this.dialog.eqId = row.Id;
                 this.dialog.mac = row.Mac;
                 this.dialog.regionId = row.RegionId;

+ 21 - 41
pc/src/views/Lesson.vue

@@ -16,12 +16,14 @@
                     is-horizontal-resize
                     :default-sort="{prop: 'date', order: 'descending'}"
                     element-loading-background="rgba(0, 0, 0, 0.8)"
-                    @selection-change="handleSelectionChange"
+                    @selection-change="handleSelectionChange"                                   @current-change="clickChange"
+>
             >
-                <el-table-column
-                        type="selection"
-                        width="55">
-                </el-table-column>
+                <el-table-column label="选择" width="55">
+    <template slot-scope="scope">
+        <el-radio  v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+    </template>
+</el-table-column>
                 <el-table-column
                         type="index"
                         label="序号"
@@ -306,7 +308,8 @@
                     total: 100,
                     pageIndex: 1,
                 },
-                tableData: []
+                tableData: [],
+                tableRadio: [],
             }
         },
         mounted() {
@@ -314,6 +317,10 @@
             this.getTableQuery();
         },
         methods: {
+            clickChange (item) {
+                this.tableRadio = item
+            },
+
             // 课程会员增删
             cofirmClassVipuserEdit() {
                 let that = this;
@@ -485,26 +492,11 @@
             // 删除
             delList() {
                 let that = this;
-                // checkNum
-                if (!this.multipleSelection.length) {
-                    that.$message({
-                        showClose: true,
-                        message: '错了哦,需要先选中至少一条记录',
-                        type: 'error'
-                    });
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                if (this.multipleSelection.length != 1) {
-                    that.$message({
-                        showClose: true,
-                        message: '错了哦,只能选中一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-
-                let row = that.multipleSelection[0];
-                console.log(row);
+                let row = that.tableRadio;
                 let param = {
                     token: localStorage.token,
                     classId: row.ClassSelf.ClassId,
@@ -586,28 +578,16 @@
             },
             // 增删会员课程
             lessonStudenChange() {
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,需要先选中至少一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-                if (this.multipleSelection.length != 1) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,只能选中一条记录',
-                        type: 'error'
-                    });
+                this.panelSelect();
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                this.panelSelect();
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 let userArrary = [];
                 row.Userlist.map(function (item) {
                     userArrary.push(item.Id)
-                })
+                });
                 this.form.classId = row.ClassSelf.ClassId;
                 this.dialogValue = userArrary;
                 this.dialogVisible = true

+ 18 - 38
pc/src/views/LessonTable.vue

@@ -16,12 +16,14 @@
                     :default-sort="{prop: 'date', order: 'descending'}"
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
-                    @selection-change="handleSelectionChange"
+                    @selection-change="handleSelectionChange"                                   @current-change="clickChange"
+>
             >
-                <el-table-column
-                        type="selection"
-                        width="55">
-                </el-table-column>
+                <el-table-column label="选择" width="55">
+    <template slot-scope="scope">
+        <el-radio  v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+    </template>
+</el-table-column>
                 <el-table-column
                         type="index"
                         label="序号"
@@ -201,13 +203,17 @@
                     Id: '',
                     name: '',
                 },
-                tableData: []
+                tableData: [],
+                tableRadio: [],
             }
         },
         mounted() {
             this.getTableQuery();
         },
         methods: {
+            clickChange (item) {
+                this.tableRadio = item
+            },
             seeWeek(row) {
                 let that = this;
 
@@ -265,25 +271,11 @@
             // 删除
             delList() {
                 let that = this;
-                // checkNum
-                if (!this.multipleSelection.length) {
-                    that.$message({
-                        showClose: true,
-                        message: '错了哦,需要先选中至少一条记录',
-                        type: 'error'
-                    });
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                if (this.multipleSelection.length != 1) {
-                    that.$message({
-                        showClose: true,
-                        message: '错了哦,只能选中一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-
-                let row = that.multipleSelection[0];
+                let row = that.tableRadio;
 
                 let param = {
                     token: localStorage.token,
@@ -320,23 +312,11 @@
             },
             copyDialog() {
                 let that = this;
-                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'
-                    });
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                let row = that.multipleSelection[0];
+                let row = that.tableRadio;
                 this.copyForm.name = '';
                 this.copyForm.Id = row.PlanId;
                 this.dialogCopyVisible = true;

+ 13 - 12
pc/src/views/Log.vue

@@ -44,20 +44,18 @@
                     :default-sort="{prop: 'date', order: 'descending'}"
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
-                    @selection-change="handleSelectionChange"
-
             >
                 <el-table-column
                         type="index"
                         label="序号"
                         align="center"
-
                         width="50">
                 </el-table-column>
                 <el-table-column
                         prop="CreatedAt"
                         label="日期"
                         :formatter="filterFmtDate"
+                        width="180"
                         sortable
                 >
                 </el-table-column>
@@ -65,11 +63,13 @@
                         prop="OptName"
                         label="操作者"
                         sortable
+                        width="120"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="OptPhone"
                         label="手机号"
+                        width="120"
                 >
                 </el-table-column>
                 <el-table-column
@@ -81,13 +81,12 @@
                         <el-popover
                                 placement="top"
                                 title="具体语句"
-                                width="200"
                                 trigger="hover"
                                 :content="scope.row.Parameter">
                             <span slot="reference"
-                                  v-if="scope.row.Parameter.length > 20">{{scope.row.Parameter.substr(0,20)}} ....</span>
+                                  v-if="scope.row.Parameter.length > 40">{{scope.row.Parameter.substr(0,40)}} ....</span>
                         </el-popover>
-                        <span v-if="scope.row.Parameter.length <= 20">{{scope.row.Parameter}}</span>
+                        <span v-if="scope.row.Parameter.length <= 40">{{scope.row.Parameter}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -99,6 +98,7 @@
                 <el-table-column
                         prop="Result"
                         label="操作结果"
+                        width="120"
                         sortable
                 >
                 </el-table-column>
@@ -186,7 +186,7 @@
                     if (json.Code == 0) {
                         that.panel.options = this.turnResToOptionByUsers(json.Rs);
                         that.panel.options.unshift({value: '', label: "全部"});
-                        console.log( that.panel.options);
+                        console.log(that.panel.options);
                     } else {
                         that.$message.error(json.Memo);
                     }
@@ -219,7 +219,7 @@
             },
             // 页面数据查询
             getTableQuery() {
-                console.log( this.panel.userId);
+                console.log(this.panel.userId);
                 let that = this;
                 // this.getGetChildRegionSelect(0, 1);
                 that.loading = true;
@@ -229,8 +229,8 @@
                     name: this.panel.name,
                     phone: this.panel.phone,
                     userId: this.panel.userId,
-                    bt: nonTfmtDatetoLength(that.panel.timeScope[0], 10)+" 00:00:00",
-                    et: nonTfmtDatetoLength(that.panel.timeScope[1], 10)+" 23:59:59",
+                    bt: nonTfmtDatetoLength(that.panel.timeScope[0], 10) + " 00:00:00",
+                    et: nonTfmtDatetoLength(that.panel.timeScope[1], 10) + " 23:59:59",
                     start: 1,//
                     tableMax: 9999,//
                 };
@@ -306,8 +306,9 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 770px;
-         overflow-y: scroll;
+    .context {
+        height: 770px;
+        overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

+ 2 - 2
pc/src/views/Main.vue

@@ -123,11 +123,11 @@
                             <span>
                                 {{as.UserName}}
                                 {{as.Phone}}  &nbsp; &nbsp; &nbsp;
-                                <em>预约时间:  {{as.OrderCreateTime |parseDate}}</em>
+                                <em>预约时间:  {{as.Base.CreatedAt |parseDate}}</em>
                           </span>
                         </div>
                         <div class="asContent">
-                            <span>上课时间:<em>{{as.BeginStr}}</em></span>
+                            <span>上课时间:<em>{{as.CurrentDate.substr(5,6)}} {{as.BeginStr}}</em></span>
                             <span>预约状态:
                                 <em v-if="as.Status == 1" class="green">已预约</em>
                                 <em v-if="as.Status == 2" class="red">已取消</em>

+ 27 - 85
pc/src/views/Member.vue

@@ -59,12 +59,14 @@
                     :default-sort="{prop: 'date', order: 'descending'}"
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
-                    @selection-change="handleSelectionChange"
+                    @selection-change="handleSelectionChange"                                   @current-change="clickChange"
+>
             >
-                <el-table-column
-                        type="selection"
-                        width="55">
-                </el-table-column>
+                <el-table-column label="选择" width="55">
+    <template slot-scope="scope">
+        <el-radio  v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+    </template>
+</el-table-column>
                 <el-table-column
                         type="index"
                         label="序号"
@@ -361,7 +363,8 @@
                     dialogValue: [],//穿梭已选
                 },
                 memberTypes: vipOptions(1),
-                tableData: []
+                tableData: [],
+                tableRadio: []
             }
         },
         mounted() {
@@ -371,6 +374,9 @@
             this.getTableQuery();
         },
         methods: {
+            clickChange (item) {
+                this.tableRadio = item
+            },
             // 编辑
             editMember(row) {
                 let that = this;
@@ -464,29 +470,15 @@
                 this.dialogExpTime = false;
                 this.dialogLessonTable = false;
             },
-            // 用户禁用 todo
-            // 用户启用 todo
             // 有效期调整
             ExpTimeChange() {
                 // 仅针对年费用户,使用日期格式
                 this.allDialogClose();
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,需要先选中至少一条记录',
-                        type: 'error'
-                    });
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                if (this.multipleSelection.length != 1) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,只能选中一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 if (parseInt(row.UserInfo.VipType) == 2) {
                     this.$message({
                         showClose: true,
@@ -504,23 +496,11 @@
             // 课时调整
             lessonChange() {
                 this.allDialogClose();
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,需要先选中至少一条记录',
-                        type: 'error'
-                    });
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                if (this.multipleSelection.length != 1) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,只能选中一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-                let row = this.multipleSelection[0];
+                let row =  this.tableRadio;
                 this.form.normalhour = row.UserInfo.RemainNormalhour;
                 this.form.newnormalhour = 0;
                 this.form.rowName = row.UserInfo.Name;
@@ -532,23 +512,11 @@
             // 赠送调整
             giftChange() {
                 this.allDialogClose();
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,需要先选中至少一条记录',
-                        type: 'error'
-                    });
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                if (this.multipleSelection.length != 1) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,只能选中一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-                let row = this.multipleSelection[0];
+                let row =  this.tableRadio;
                 this.form.gifthour = row.UserInfo.RemainGifthour;
                 this.form.newgifthour = 0;
                 this.form.rowName = row.UserInfo.Name;
@@ -563,23 +531,11 @@
                 this.allDialogClose();
                 // 重载课程列表选项
                 this.panelSelect();
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,需要先选中至少一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-                if (this.multipleSelection.length != 1) {
-                    this.$message({
-                        showClose: true,
-                        message: '错了哦,只能选中一条记录',
-                        type: 'error'
-                    });
+                if(this.tableRadio.length == 0){
+                    that.$message.error("请先选中一条记录");
                     return false
                 }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 this.form.rowName = row.UserInfo.Name;
                 this.form.userId = row.UserInfo.Id;
                 if (row.ClassInfo) {
@@ -847,25 +803,11 @@
             // 删除
             delList() {
                 let that = this;
-                // checkNum
-                if (!this.multipleSelection.length) {
-                    that.$message({
-                        showClose: true,
-                        message: '错了哦,需要先选中至少一条记录',
-                        type: 'error'
-                    });
+                if(this.tableRadio.length == 0){
+                    that.$message.error("请先选中一条记录");
                     return false
                 }
-                if (this.multipleSelection.length != 1) {
-                    that.$message({
-                        showClose: true,
-                        message: '错了哦,只能选中一条记录',
-                        type: 'error'
-                    });
-                    return false
-                }
-
-                let detectorid = that.multipleSelection[0].UserInfo.Id;
+                let detectorid =  this.tableRadio.UserInfo.Id;
 
                 let param = {
                     token: localStorage.token,

+ 26 - 44
pc/src/views/ShopManage.vue

@@ -37,13 +37,15 @@
                     :default-sort="{prop: 'date', order: 'descending'}"
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
-                    @selection-change="handleSelectionChange"
-
+                    @selection-change="handleSelectionChange" @current-change="clickChange"
             >
-                <el-table-column
-                        type="selection"
-                        width="55">
-                </el-table-column>
+
+                >
+                <el-table-column label="选择" width="55">
+    <template slot-scope="scope">
+        <el-radio  v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+    </template>
+</el-table-column>
                 <el-table-column
                         type="index"
                         label="序号"
@@ -168,13 +170,17 @@
                     btnState: 0,
                 },
                 shops: [],
-                tableData: []
+                tableData: [],
+                tableRadio: [],
             }
         },
         mounted() {
             this.getTableQuery();
         },
         methods: {
+            clickChange (item) {
+                this.tableRadio = item
+            },
             // 新增 确认提交
             confirmAdmin() {
                 let that = this;
@@ -303,28 +309,15 @@
             // 删除
             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'
-                    });
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                let ShopID = that.multipleSelection[0].ShopID;
+                let ShopID = this.tableRadio.ShopID;
 
                 let param = {
                     token: localStorage.token,
-                    shopId : ShopID,
+                    shopId: ShopID,
                     status: 9,//0禁用1启用9删除
                 };
                 let postdata = qs.stringify(param);
@@ -376,32 +369,20 @@
             editList() {
                 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
-                }
                 this.clearForm();
                 this.form.btnState = 1; //编辑
-                let row = that.multipleSelection[0];
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
+                    return false
+                }
+                let row = this.tableRadio;
                 this.form.shopId = row.ShopID;
                 this.form.shopName = row.ShopName;
                 this.form.addr = row.Addr;
                 this.form.contacts = row.Contacts;
                 this.form.phone = row.Phone;
 
-                this.dialogVisible = true
+                this.dialogVisible = true;
                 this.dialogTitle = '编辑店面'
             },
             handleSelectionChange(val) {
@@ -500,8 +481,9 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 770px;
-         overflow-y: scroll;
+    .context {
+        height: 770px;
+        overflow-y: scroll;
 
         display: block;
         margin: 0 auto;

+ 27 - 20
pc/src/views/appoint.vue

@@ -54,11 +54,13 @@
                                 :default-sort="{prop: 'date', order: 'descending'}"
                                 element-loading-background="rgba(0, 0, 0, 0.8)"
                                 class=""
-                                @selection-change="handleSelectionChange"
+                                @selection-change="handleSelectionChange" @current-change="clickChange"
                         >
-                            <el-table-column
-                                    type="selection"
-                                    width="55">
+                            >
+                            <el-table-column label="选择" width="55">
+                                <template slot-scope="scope">
+                                    <el-radio v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+                                </template>
                             </el-table-column>
                             <el-table-column
                                     type="index"
@@ -93,7 +95,7 @@
                             >
                             </el-table-column>
                             <el-table-column
-                                    prop="OrderCreateTime"
+                                    prop="Base.CreatedAt"
                                     label="会员预约时间"
                                     :formatter="filterFmtDate"
                                     sortable
@@ -152,16 +154,12 @@
                                 :default-sort="{prop: 'date', order: 'descending'}"
                                 element-loading-background="rgba(0, 0, 0, 0.8)"
                                 class=""
-                                @selection-change="handleSelectionChange"
-                        >
-                            <el-table-column
-                                    type="selection"
-                                    width="55">
-                            </el-table-column>
+                                @selection-change="handleSelectionChange" @current-change="clickChange"
+                            >
                             <el-table-column
                                     type="index"
                                     label="序号"
-                        align="center"
+                                    align="center"
 
                                     width="50">
                             </el-table-column>
@@ -251,7 +249,8 @@
                 <div class="">
                     <el-form ref="form" :model="form" label-width="160px">
                         <el-form-item label="当前日期" :required="true">
-                            <el-input v-model="form.displayDay" placeholder="placeholder" :disabled="true" style="width: 220px"></el-input>
+                            <el-input v-model="form.displayDay" placeholder="placeholder" :disabled="true"
+                                      style="width: 220px"></el-input>
                         </el-form-item>
                         <el-form-item label="课程" :required="true">
                             <el-select v-model="form.stdId" filterable placeholder="请选择"
@@ -400,6 +399,7 @@
                 ],
                 tableData: [],
                 tableData2: [],
+                tableRadio: [],
             }
         },
         mounted() {
@@ -416,6 +416,9 @@
 
         },
         methods: {
+            clickChange(item) {
+                this.tableRadio = item
+            },
             // .课程表详情微信可预约状态修改
             changeWechat(e, appoint) {
                 let that = this;
@@ -704,7 +707,7 @@
                     });
                     return false
                 }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 if (parseInt(row.vipType) == 2) {
                     this.$message({
                         showClose: true,
@@ -737,7 +740,7 @@
                     });
                     return false
                 }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 this.form.lesson = row.Recovered;
                 this.form.rowName = row.name;
                 this.dialogVisible = true;
@@ -763,7 +766,7 @@
                     });
                     return false
                 }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 this.form.gift = row.Recovered;
                 this.form.rowName = row.name;
                 this.dialogVisible = true;
@@ -789,7 +792,7 @@
                     });
                     return false
                 }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 this.form.gift = row.Recovered;
                 this.form.rowName = row.name;
                 this.dialogVisible = true;
@@ -1017,13 +1020,13 @@
                     }
                 })
             },
-            // 新增教练
+            // 新增预约
             addMember() {
                 this.clearForm();
                 // 加载当前可选课程
                 this.getClassListByOrderDate();
                 this.dialogMemberVisible = true;
-                this.form.displayDay =  this.weeks[this.choiceDate].data +' '+ this.weeks[this.choiceDate].name;
+                this.form.displayDay = this.weeks[this.choiceDate].data + ' ' + this.weeks[this.choiceDate].name;
                 this.btnType = 0;
                 this.dialogTitle = '新增预约';
             },
@@ -1066,7 +1069,7 @@
                     return false
                 }
 
-                let detectorid = that.multipleSelection[0].Id;
+                let detectorid = that.tableRadio.Id;
 
                 let param = {
                     token: localStorage.token,
@@ -1326,6 +1329,8 @@
 
             },
             activeName(val) {
+                // 重置一次选择
+                this.tableRadio = [];
                 if (val == 'first') {
                     this.getTableQuery();
                 } else {
@@ -1543,10 +1548,12 @@
         overflow: hidden;
         margin-top: 5px;
     }
+
     .timeList li.active {
         color: #fff;
         background: #409EFF;
     }
+
     .timeList li.active span, .timeList li.active em {
         color: #fff;
     }

+ 8 - 6
pc/src/views/coach.vue

@@ -32,12 +32,14 @@
                     :default-sort="{prop: 'date', order: 'descending'}"
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
-                    @selection-change="handleSelectionChange"
+                    @selection-change="handleSelectionChange"                                   @current-change="clickChange"
+>
             >
-                <el-table-column
-                        type="selection"
-                        width="55">
-                </el-table-column>
+                <el-table-column label="选择" width="55">
+    <template slot-scope="scope">
+        <el-radio  v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+    </template>
+</el-table-column>
                 <el-table-column
                         type="index"
                         label="序号"
@@ -420,7 +422,7 @@
                     return false
                 }
 
-                let TeacherId = that.multipleSelection[0].TeacherId;
+                let TeacherId = that.tableRadio.TeacherId;
 
                 let param = {
                     token: localStorage.token,

+ 6 - 5
pc/src/views/cost.vue

@@ -52,6 +52,7 @@
                     show-summary
                     :summary-method="getSummaries"
                     @selection-change="handleSelectionChange"
+>
 
             >
                 <el-table-column
@@ -453,7 +454,7 @@
                     });
                     return false
                 }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 if (parseInt(row.vipType) == 2) {
                     this.$message({
                         showClose: true,
@@ -486,7 +487,7 @@
                     });
                     return false
                 }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 this.form.lesson = row.Recovered;
                 this.form.rowName = row.name;
                 this.dialogVisible = true;
@@ -512,7 +513,7 @@
                     });
                     return false
                 }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 this.form.gift = row.Recovered;
                 this.form.rowName = row.name;
                 this.dialogVisible = true;
@@ -538,7 +539,7 @@
                     });
                     return false
                 }
-                let row = this.multipleSelection[0];
+                let row = this.tableRadio;
                 this.form.gift = row.Recovered;
                 this.form.rowName = row.name;
                 this.dialogVisible = true;
@@ -811,7 +812,7 @@
                     return false
                 }
 
-                let detectorid = that.multipleSelection[0].Id;
+                let detectorid = that.tableRadio.Id;
 
                 let param = {
                     token: localStorage.token,

+ 1 - 0
pc/src/views/finish.vue

@@ -14,6 +14,7 @@
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
                     @selection-change="handleSelectionChange"
+>
             >
                 <el-table-column
                         type="index"

+ 2 - 1
pc/src/views/finishDetail.vue

@@ -35,6 +35,7 @@
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
                     @selection-change="handleSelectionChange"
+>
             >
                 <el-table-column
                         type="index"
@@ -515,7 +516,7 @@
                     return false
                 }
 
-                let detectorid = that.multipleSelection[0].Id;
+                let detectorid = that.tableRadio.Id;
 
                 let param = {
                     token: localStorage.token,

+ 20 - 41
pc/src/views/lessonManage.vue

@@ -7,7 +7,7 @@
             <el-button type="primary" @click="addLessonTable">新增课程表</el-button>
             <el-button type="" @click="copy">复制</el-button>
             <el-button type="" @click="delList">删除</el-button>
-            <el-button type="" @click="query">查询</el-button>
+            <el-button type="" @click="query">刷新</el-button>
         </div>
         <div class="table">
             <el-table
@@ -17,12 +17,14 @@
                     :default-sort="{prop: 'date', order: 'descending'}"
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
-                    @selection-change="handleSelectionChange"
+                    @selection-change="handleSelectionChange"                                   @current-change="clickChange"
+>
             >
-                <el-table-column
-                        type="selection"
-                        width="55">
-                </el-table-column>
+                <el-table-column label="选择" width="55">
+    <template slot-scope="scope">
+        <el-radio  v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+    </template>
+</el-table-column>
                 <el-table-column
                         type="index"
                         label="序号"
@@ -240,13 +242,17 @@
                     wechat: 1,
                     appoint: 1,
                 },
-                tableData: []
+                tableData: [],
+                tableRadio: [],
             }
         },
         mounted() {
             this.getTableQuery();
         },
         methods: {
+            clickChange (item) {
+                this.tableRadio = item
+            },
             // 编辑名称
             editName(row) {
                 this.form.name = row.Name;
@@ -286,25 +292,11 @@
             // 删除
             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'
-                    });
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-
-                let row = that.multipleSelection[0];
+                let row = that.tableRadio;
 
                 if (row.Diffweek < 0) {
                     that.$message({
@@ -415,25 +407,12 @@
             },
             copy() {
                 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'
-                    });
+                this.dialogCopyVisible = true;
+                if(this.tableRadio.length == 0){
+                    this.$message.error("请先选中一条记录");
                     return false
                 }
-                this.dialogCopyVisible = true;
-                this.copyForm = that.multipleSelection[0];
+                this.copyForm = that.tableRadio;
             },
             // 发布课程表
             openLessonTable(row) {

+ 2 - 1
pc/src/views/record.vue

@@ -61,6 +61,7 @@
                     element-loading-background="rgba(0, 0, 0, 0.8)"
                     class=""
                     @selection-change="handleSelectionChange"
+>
 
             >
                 <el-table-column
@@ -98,7 +99,7 @@
                 >
                 </el-table-column>
                 <el-table-column
-                        prop="OrderCreateTime"
+                        prop="Base.CreatedAt"
                         label="预约日期"
                         width="180"
                         :formatter="filterFmtDate"