增加预约时间限制

pc/src/views/ShopManage.vue

@@ -31,15 +31,9 @@
             <el-button @click="delList" type="danger" size="mini">删除店面</el-button>
         </div>
         <div class="table">
-            <el-table
-                    :data="tableData"
-                    border
-                    is-horizontal-resize
-                    :default-sort="{prop: 'date', order: 'descending'}"
-                    element-loading-background="rgba(0, 0, 0, 0.8)"
-                    class=""
-                    @selection-change="handleSelectionChange" @current-change="clickChange"
-            >
+            <el-table :data="tableData" border is-horizontal-resize :default-sort="{prop: 'date', order: 'descending'}"
+                element-loading-background="rgba(0, 0, 0, 0.8)" class="" @selection-change="handleSelectionChange"
+                @current-change="clickChange">
 
                 >
                 <el-table-column label="选择" width="55">
@@ -52,42 +46,33 @@
                         <span>{{(start) + scope.$index + 1}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="ShopName"
-                        label="店面名称"
-                        sortable
-                >
+                <el-table-column prop="ShopName" label="店面名称" sortable>
                 </el-table-column>
-                <el-table-column
-                        prop="Addr"
-                        label="位置"
-                        sortable
-                >
+                <el-table-column prop="Addr" label="位置" sortable>
                 </el-table-column>
-                <el-table-column
-                        prop="Contacts"
-                        label="负责人"
-                        sortable
-                >
+                <el-table-column prop="Contacts" label="负责人" sortable>
                 </el-table-column>
-                <el-table-column
-                        prop="Phone"
-                        label="联系电话"
-                >
+                <el-table-column prop="Phone" label="联系电话">
+                </el-table-column>
+                <el-table-column prop="MaxOrderLim" label="预约限制(分钟)">
+                </el-table-column>
+                <el-table-column prop="MaxCancelOrderLim" label="取消预约限制(分钟)">
+                </el-table-column>
+                <el-table-column prop="IsBcPunish" label="违约扣课时">
+                    <template scope="scope">
+                        <span v-if="scope.row.IsBcPunish == 0">不扣</span>
+                        <span v-if="scope.row.IsBcPunish == 1">扣课时</span>
+                    </template>
                 </el-table-column>
             </el-table>
             <br>
-            <el-pagination
-                    background
-                    :total="pageination.total"
-                    :page-size="pageination.pageItem"
-                    @current-change="pageChange"
-            ></el-pagination>
+            <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
+                @current-change="pageChange"></el-pagination>
         </div>
 
         <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="650px">
             <div>
-                <el-form ref="form" :model="form" label-width="80px">
+                <el-form ref="form" :model="form" label-width="140px">
                     <el-form-item label="店面名称">
                         <el-input v-model="form.shopName"></el-input>
                     </el-form-item>
@@ -100,6 +85,16 @@
                     <el-form-item label="联系电话">
                         <el-input v-model="form.phone"></el-input>
                     </el-form-item>
+                    <el-form-item label="预约限制(分钟)">
+                        <el-input v-model="form.maxOrderLim" type="number"></el-input>
+                    </el-form-item>
+                    <el-form-item label="取消预约限制(分钟)">
+                        <el-input v-model="form.maxCancelOrderLim" type="number"></el-input>
+                    </el-form-item>
+                    <el-form-item label="违约扣课时">
+                        <el-radio v-model="form.isBcPunish" label="0">不扣</el-radio>
+                        <el-radio v-model="form.isBcPunish" label="1">扣课时</el-radio>
+                    </el-form-item>
                 </el-form>
             </div>
             <div class="dialogFooter">
@@ -169,6 +164,9 @@
                     userCode: '',
                     shopId: '',
                     btnState: 0,
+                    maxOrderLim: 0,
+                    maxCancelOrderLim: 0,
+                    isBcPunish: "0",
                 },
                 shops: [],
                 tableData: [],
@@ -222,6 +220,22 @@
                     this.$message.error('错了哦，联系电话不能为空');
                     return false
                 }
+                if (!that.form.maxOrderLim) {
+                    this.$message.error('错了哦，用户预约限制时间不能为空');
+                    return false
+                }
+                if (that.form.maxOrderLim < 0) {
+                    this.$message.error('错了哦，用户预约限制时间不能为负数');
+                    return false
+                } 
+                if (!that.form.maxCancelOrderLim) {
+                    this.$message.error('错了哦，用户取消预约限制不能为空');
+                    return false
+                }
+                if (that.form.maxCancelOrderLim < 0) {
+                    this.$message.error('错了哦，用户取消预约限制不能为负数');
+                    return false
+                }
                 // if (!globalCheckPhone(that.form.phone)) {
                 //   this.$message.error('错了哦，联系电话格式不正确');
                 //   return false
@@ -233,6 +247,9 @@
                     contacts: that.form.contacts,
                     phone: that.form.phone,
                     shopid: that.form.shopid,
+                    maxOrderLim: that.form.maxOrderLim,
+                    maxCancelOrderLim: that.form.maxCancelOrderLim,
+                    isBcPunish: that.form.isBcPunish,
                 };
                 let postdata = qs.stringify(param);
                 ShopAdd(postdata).then(res => {
@@ -284,6 +301,22 @@
                     this.$message.error('错了哦，联系电话不能为空');
                     return false
                 }
+                if (!that.form.maxOrderLim) {
+                    this.$message.error('错了哦，用户预约限制时间不能为空');
+                    return false
+                }
+                if (that.form.maxOrderLim < 0) {
+                    this.$message.error('错了哦，用户预约限制时间不能为负数');
+                    return false
+                } 
+                if (!that.form.maxCancelOrderLim) {
+                    this.$message.error('错了哦，用户取消预约限制不能为空');
+                    return false
+                }
+                if (that.form.maxCancelOrderLim < 0) {
+                    this.$message.error('错了哦，用户取消预约限制不能为负数');
+                    return false
+                }
                 // if (!globalCheckPhone(that.form.phone)) {
                 //   this.$message.error('错了哦，联系电话格式不正确');
                 //   return false
@@ -295,6 +328,9 @@
                     contacts: that.form.contacts,
                     phone: that.form.phone,
                     shopId: that.form.shopId,
+                    maxOrderLim: that.form.maxOrderLim,
+                    maxCancelOrderLim: that.form.maxCancelOrderLim,
+                    isBcPunish: that.form.isBcPunish,
                 };
                 let postdata = qs.stringify(param);
                 ShopEdit(postdata).then(res => {
@@ -390,6 +426,9 @@
                 this.form.addr = row.Addr;
                 this.form.contacts = row.Contacts;
                 this.form.phone = row.Phone;
+                this.form.maxOrderLim = row.MaxOrderLim;
+                this.form.maxCancelOrderLim = row.MaxCancelOrderLim;
+                this.form.isBcPunish = row.IsBcPunish.toString();
 
                 this.dialogVisible = true;
                 this.dialogTitle = '编辑店面'
@@ -568,4 +607,4 @@
         float: right;
         margin-left: 10px;
     }
-</style>
+</style>

tv/src/Global.js

@@ -6,9 +6,9 @@ companyInfo = {
 };
 
 // 当前版本   演示版
-runVersion = 'test';
+// runVersion = 'test';
 // 户外版本
-// runVersion = 'outDoor';
+runVersion = 'outDoor';
 // normal
 // runVersion = 'normal';