Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-tenant-frontend

src/api/allDaysPriceRuleApi.js

@@ -13,3 +13,44 @@ export function  fetch() {
         params: {}
     })
  }
+
+
+ /**
+ * 保存
+ * @returns 
+ */
+export function  save(data) { 
+    return axios({
+        url: '/rooms/cesAllDayPriceRule/modify',
+        method: 'post',
+        data: data
+    })
+ }
+
+  /**
+ * 保存钟点房计费规则
+ * @returns 
+ */
+export function  saveHourRule(data) { 
+    return axios({
+        url: '/rooms/cesHourRoomRule/save',
+        method: 'post',
+        data: data
+    })
+ }
+
+
+  /**
+ * 修改钟点房计费规则
+ * @returns 
+ */
+export function  editHourRule(data) { 
+    return axios({
+        url: '/rooms/cesHourRoomRule/modify',
+        method: 'post',
+        data: data
+    })
+ }
+
+
+ 

src/views/settings/components/modules/payInterfaceConfigForm.vue

@@ -0,0 +1,165 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="关联支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTypeId">
+<!--              <a-input v-model="model.payTypeId" placeholder="请输入关联支付方式"  ></a-input>-->
+              <a-select
+                      v-model="model.payTypeId"
+                      placeholder="请选择支付方式"
+                      :allowClear="true"
+              >
+                <a-select-option :value="item.id" v-for="(item,index) in payTypeList" :key="index">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="merchantNo">
+              <a-input v-model="model.merchantNo" placeholder="请输入商户号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="终端号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="terminalNo">
+              <a-input v-model="model.terminalNo" placeholder="请输入终端号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="TOKEN令牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="token">
+              <a-input v-model="model.token" placeholder="请输入TOKEN令牌"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <a-select v-model="model.status" style="width: 100%">
+                <a-select-option value="0">关闭</a-select-option>
+                <a-select-option value="1">启用</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'payInterfaceConfigForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          status: [
+              { required: true, message: '请选择是否启用!'},
+           ],
+           payTypeId: [
+              { required: true, message: '请输入关联支付方式!'},
+           ],
+           merchantNo: [
+              { required: true, message: '请输入商户号!'},
+           ],
+           terminalNo: [
+              { required: true, message: '请输入终端号!'},
+           ],
+           token: [
+              { required: true, message: '请输入TOKEN令牌!'},
+           ],
+        },
+        url: {
+          add: "/business/busPayInterfaceConfig/add",
+          edit: "/business/busPayInterfaceConfig/edit",
+          queryById: "/business/busPayInterfaceConfig/queryById",
+          query_payType: "/business/busRoomPayType/queryList",
+        },
+        payTypeList:[]
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      getAction(this.url.query_payType,{}).then((res)=>{
+        if(res.success){
+          this.payTypeList = res.result
+        }else{
+
+        }
+      })
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        if(!this.model.id){
+          this.model.status = "1";
+        }else{
+          this.model.status = record.status.toString();
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+              var info = JSON.parse(localStorage.getItem("storeInfo"));
+              this.model.hotelId = info.id;
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
+</script>

src/views/settings/components/modules/payInterfaceConfigModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <pay-interface-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-interface-config-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import payInterfaceConfigForm from './payInterfaceConfigForm'
+
+  export default {
+    name: 'payInterfaceConfigModal',
+    components: {
+      payInterfaceConfigForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

src/views/settings/components/modules/payInterfaceConfigModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <pay-interface-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-interface-config-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import payInterfaceConfigForm from './payInterfaceConfigForm'
+  export default {
+    name: 'payInterfaceConfigModal',
+    components: {
+      payInterfaceConfigForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/settings/components/modules/waiterForm.vue

@@ -13,6 +13,16 @@
               <a-input v-model="model.name" placeholder="请输入服务员姓名"  ></a-input>
             </a-form-model-item>
           </a-col>
+            <a-col :span="24">
+                <a-form-model-item label="身份证号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idCard">
+                    <a-input v-model="model.idCard" placeholder="请输入身份证号"  ></a-input>
+                </a-form-model-item>
+            </a-col>
+            <a-col :span="24">
+                <a-form-model-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+                    <a-input v-model="model.phone" placeholder="请输入手机号"  ></a-input>
+                </a-form-model-item>
+            </a-col>
           <a-col :span="24">
             <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
 <!--              <a-input-number v-model="model.sex" placeholder="请输入性别(0-默认未知,1-男,2-女)" style="width: 100%" />-->
@@ -45,112 +55,116 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'waiterForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-          workNo: [
-              { required: true, message: '请输入服务员工号!'},
-           ],
-          name: [
-            { required: true, message: '请输入服务员姓名!'},
-          ],
-          sex: [
-            { required: true, message: '请选择服务员性别!'},
-          ],
-          status: [
-              { required: true, message: '请选择服务员是否有效!'},
-           ],
-        },
-        url: {
-          add: "/business/busWaiter/add",
-          edit: "/business/busWaiter/edit",
-          queryById: "/business/busWaiter/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
+      name: 'waiterForm',
+      components: {},
+      props: {
+          //表单禁用
+          disabled: {
+              type: Boolean,
+              default: false,
+              required: false
+          }
       },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        //初始化默认值
-        this.edit(this.modelDefault);
-        this.edit({status:true });
+      data() {
+          return {
+              model: {},
+              labelCol: {
+                  xs: {span: 24},
+                  sm: {span: 5},
+              },
+              wrapperCol: {
+                  xs: {span: 24},
+                  sm: {span: 16},
+              },
+              confirmLoading: false,
+              validatorRules: {
+                  workNo: [
+                      {required: true, message: '请输入服务员工号!'},
+                  ],
+                  name: [
+                      {required: true, message: '请输入服务员姓名!'},
+                  ],
+                  idCard: [
+                      {required: true, message: '请输入身份证号!'},
+                  ],
+                  phone: [
+                      {required: true, message: '请输入手机号!'},
+                  ],
+                  sex: [
+                      {required: true, message: '请选择服务员性别!'},
+                  ],
+                  status: [
+                      {required: true, message: '请选择服务员是否有效!'},
+                  ],
+              },
+              url: {
+                  add: "/business/busWaiter/add",
+                  edit: "/business/busWaiter/edit",
+                  queryById: "/business/busWaiter/queryById"
+              }
+          }
       },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        if (this.model.status == 1){
-          this.model.status = true;
-        }else {
-          this.model.status = false;
-        }
-
+      computed: {
+          formDisabled() {
+              return this.disabled
+          },
       },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              var info = JSON.parse(localStorage.getItem("storeInfo"));
-              this.model.hotelId = info.id;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            if (this.model.status){
-              this.model.status = 1;
-            }else {
-              this.model.status = 0;
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
+      created() {
+          //备份model原始值
+          this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      },
+      methods: {
+          add() {
+              //初始化默认值
+              this.edit(this.modelDefault);
+              this.edit({status: true});
+          },
+          edit(record) {
+              this.model = Object.assign({}, record);
+              this.visible = true;
+              if (record.status == 1) {
+                  this.model.status = true;
+              } else {
+                  this.model.status = false;
               }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
 
-        })
-      },
-    }
+          },
+          submitForm() {
+              const that = this;
+              // 触发表单验证
+              this.$refs.form.validate(valid => {
+                  if (valid) {
+                      that.confirmLoading = true;
+                      let httpurl = '';
+                      let method = '';
+                      if (!this.model.id) {
+                          httpurl += this.url.add;
+                          var info = JSON.parse(localStorage.getItem("storeInfo"));
+                          this.model.hotelId = info.id;
+                          method = 'post';
+                      } else {
+                          httpurl += this.url.edit;
+                          method = 'put';
+                      }
+                      if (this.model.status) {
+                          this.model.status = 1;
+                      } else {
+                          this.model.status = 0;
+                      }
+                      httpAction(httpurl, this.model, method).then((res) => {
+                          if (res.success) {
+                              that.$message.success(res.message);
+                              that.$emit('ok');
+                          } else {
+                              that.$message.warning(res.message);
+                          }
+                      }).finally(() => {
+                          that.confirmLoading = false;
+                      })
+                  }
+
+              })
+          },
+      }
   }
 </script>

src/views/settings/components/payApiSettings.vue

@@ -1,135 +1,389 @@
+<!--<template>-->
+<!--    <a-spin :spinning="confirmLoading">-->
+<!--        <j-form-container :disabled="formDisabled">-->
+<!--            <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">-->
+<!--                <a-form-item v-show="false"><a-input v-model="model.id"/></a-form-item>-->
+<!--                <a-row>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">-->
+<!--                            <a-select v-model="model.status" style="width: 100%">-->
+<!--                                <a-select-option value="0">关闭</a-select-option>-->
+<!--                                <a-select-option value="1">启用</a-select-option>-->
+<!--                                &lt;!&ndash;                                <a-select-option v-for="(item,index) in cardinalList" style="width: 100%"&ndash;&gt;-->
+<!--                                &lt;!&ndash;                                                 :key="index" :value="item.value">{{ item.text || item.label }}</a-select-option>&ndash;&gt;&ndash;&gt;-->
+<!--                            </a-select>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="绑定" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTypeId">-->
+<!--                            <a-select-->
+<!--                                    v-model="model.payTypeId"-->
+<!--                                    placeholder="请选择支付方式"-->
+<!--                                    :allowClear="true"-->
+<!--                            >-->
+<!--                                <a-select-option :value="item.id" v-for="(item,index) in payTypeList" :key="index">{{ item.name }}</a-select-option>-->
+<!--                            </a-select>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="商户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="merchantNo">-->
+<!--                            <a-input v-model="model.merchantNo" placeholder="请输入商户号"  ></a-input>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="终端号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="terminalNo">-->
+<!--                            <a-input v-model="model.terminalNo" placeholder="请输入终端号"  ></a-input>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="TOKEN令牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="token">-->
+<!--                            <a-input v-model="model.token" placeholder="请输入TOKEN令牌"  ></a-input>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                </a-row>-->
+<!--                <a-button type="primary" @click="submitForm">确定</a-button>-->
+<!--            </a-form-model>-->
+<!--        </j-form-container>-->
+<!--    </a-spin>-->
+<!--</template>-->
+
+<!--<script>-->
+
+<!--    import { httpAction, getAction } from '@/api/manage'-->
+<!--    import { validateDuplicateValue } from '@/utils/util'-->
+<!--    import {getPayApiConfigInfo} from "../../../api/api";-->
+
+<!--    export default {-->
+<!--        name: 'payApiSettings',-->
+<!--        components: {-->
+<!--        },-->
+<!--        props: {-->
+<!--            //表单禁用-->
+<!--            disabled: {-->
+<!--                type: Boolean,-->
+<!--                default: false,-->
+<!--                required: false-->
+<!--            }-->
+<!--        },-->
+<!--        data () {-->
+<!--            return {-->
+<!--                model:{-->
+<!--                },-->
+<!--                labelCol: {-->
+<!--                    xs: { span: 24 },-->
+<!--                    sm: { span: 3 },-->
+<!--                },-->
+<!--                wrapperCol: {-->
+<!--                    xs: { span: 24 },-->
+<!--                    sm: { span: 20 },-->
+<!--                },-->
+<!--                confirmLoading: false,-->
+<!--                validatorRules: {-->
+<!--                    status: [-->
+<!--                        { required: true, message: '请选择是否启用!'},-->
+<!--                    ],-->
+<!--                    payTypeId: [-->
+<!--                        { required: true, message: '请选择关联支付方式!'},-->
+<!--                    ],-->
+<!--                    merchantNo: [-->
+<!--                        { required: true, message: '请输入商户号!'},-->
+<!--                    ],-->
+<!--                    terminalNo: [-->
+<!--                        { required: true, message: '请输入终端号!'},-->
+<!--                    ],-->
+<!--                    token: [-->
+<!--                        { required: true, message: '请输入TOKEN令牌!'},-->
+<!--                    ],-->
+<!--                },-->
+<!--                url: {-->
+<!--                    add: "/business/busPayInterfaceConfig/add",-->
+<!--                    edit: "/business/busPayInterfaceConfig/edit",-->
+<!--                    query_payType: "/business/busRoomPayType/queryList",-->
+<!--                },-->
+<!--                payTypeList:[]-->
+<!--            }-->
+<!--        },-->
+<!--        computed: {-->
+<!--            formDisabled(){-->
+<!--                return this.disabled-->
+<!--            },-->
+<!--        },-->
+<!--        created () {-->
+<!--            //备份model原始值-->
+<!--            this.modelDefault = JSON.parse(JSON.stringify(this.model));-->
+<!--            var _info = JSON.parse(localStorage.getItem("storeInfo"));-->
+<!--            setTimeout(() => {-->
+<!--                getPayApiConfigInfo({-->
+<!--                }).then(res => {-->
+<!--                    console.log(res)-->
+<!--                    if (res.code == 200 && res.result ) {-->
+<!--                        var info = res.result-->
+<!--                        this.model = {-->
+<!--                            id: info.id,-->
+<!--                            status :info.status.toString(),-->
+<!--                            payTypeId:info.payTypeId,-->
+<!--                            merchantNo:info.merchantNo,-->
+<!--                            terminalNo:info.terminalNo,-->
+<!--                            token:info.token-->
+<!--                        };-->
+<!--                    }-->
+<!--                })-->
+<!--            }, 100)-->
+
+<!--            getAction(this.url.query_payType,{}).then((res)=>{-->
+<!--                if(res.success){-->
+<!--                    this.payTypeList = res.result-->
+<!--                }else{-->
+
+<!--                }-->
+<!--            })-->
+<!--        },-->
+<!--        methods: {-->
+<!--            add () {-->
+<!--                this.edit(this.modelDefault);-->
+<!--            },-->
+<!--            edit (record) {-->
+<!--                this.model = Object.assign({}, record);-->
+<!--                this.visible = true;-->
+<!--            },-->
+<!--            submitForm () {-->
+<!--                const that = this;-->
+<!--                // 触发表单验证-->
+<!--                this.$refs.form.validate(valid => {-->
+<!--                    if (valid) {-->
+<!--                        that.confirmLoading = true;-->
+<!--                        let httpurl = '';-->
+<!--                        let method = '';-->
+<!--                        if(!this.model.id){-->
+<!--                            httpurl+=this.url.add;-->
+<!--                            method = 'post';-->
+<!--                            var info = JSON.parse(localStorage.getItem("storeInfo"));-->
+<!--                            this.model.hotelId = info.id;-->
+<!--                        }else{-->
+<!--                            httpurl+=this.url.edit;-->
+<!--                            method = 'put';-->
+<!--                        }-->
+<!--                        httpAction(httpurl,this.model,method).then((res)=>{-->
+<!--                            if(res.success){-->
+<!--                                that.$message.success(res.message);-->
+<!--                                that.$emit('ok');-->
+<!--                                that.model.id = res.result.id-->
+<!--                            }else{-->
+<!--                                that.$message.warning(res.message);-->
+<!--                            }-->
+<!--                        }).finally(() => {-->
+<!--                            that.confirmLoading = false;-->
+<!--                        })-->
+<!--                    }-->
+
+<!--                })-->
+<!--            },-->
+<!--        }-->
+<!--    }-->
+<!--</script>-->
+
 <template>
-    <a-spin :spinning="confirmLoading">
-        <j-form-container :disabled="formDisabled">
-            <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-                <a-form-item v-show="false"><a-input v-model="model.id"/></a-form-item>
-                <a-row>
-                    <a-col :span="24">
-                        <a-form-model-item label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-                            <a-select v-model="model.status" style="width: 100%">
-                                <a-select-option value="0">关闭</a-select-option>
-                                <a-select-option value="1">启用</a-select-option>
-                                <!--                                <a-select-option v-for="(item,index) in cardinalList" style="width: 100%"-->
-                                <!--                                                 :key="index" :value="item.value">{{ item.text || item.label }}</a-select-option>&ndash;&gt;-->
-                            </a-select>
-                        </a-form-model-item>
-                    </a-col>
-                    <a-col :span="24">
-                        <a-form-model-item label="绑定" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTypeId">
+    <a-card :bordered="false">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline" @keyup.enter.native="searchQuery">
+                <a-row :gutter="24">
+                    <a-col :md="6" :sm="8">
+                        <a-form-item>
                             <a-select
-                                    v-model="model.payTypeId"
-                                    placeholder="请选择支付方式"
+                                    v-model="queryParam.payTypeId"
+                                    placeholder="请选择"
                                     :allowClear="true"
                             >
                                 <a-select-option :value="item.id" v-for="(item,index) in payTypeList" :key="index">{{ item.name }}</a-select-option>
                             </a-select>
-                        </a-form-model-item>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="4" :sm="6">
+                        <a-form-item>
+                            <j-input placeholder="请输入商户号" v-model="queryParam.merchantNo"></j-input>
+                        </a-form-item>
                     </a-col>
-                    <a-col :span="24">
-                        <a-form-model-item label="商户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="merchantNo">
-                            <a-input v-model="model.merchantNo" placeholder="请输入商户号"  ></a-input>
-                        </a-form-model-item>
+                    <a-col :md="4" :sm="6">
+                        <a-form-item>
+                            <j-input placeholder="请输入终端号" v-model="queryParam.terminalNo"></j-input>
+                        </a-form-item>
                     </a-col>
-                    <a-col :span="24">
-                        <a-form-model-item label="终端号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="terminalNo">
-                            <a-input v-model="model.terminalNo" placeholder="请输入终端号"  ></a-input>
-                        </a-form-model-item>
+                    <a-col :md="4" :sm="6">
+                        <a-form-item>
+                            <j-input placeholder="请输入TOKEN令牌" v-model="queryParam.token"></j-input>
+                        </a-form-item>
                     </a-col>
-                    <a-col :span="24">
-                        <a-form-model-item label="TOKEN令牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="token">
-                            <a-input v-model="model.token" placeholder="请输入TOKEN令牌"  ></a-input>
-                        </a-form-model-item>
+                    <a-col :md="4" :sm="6">
+                        <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                        </span>
                     </a-col>
                 </a-row>
-                <a-button type="primary" @click="submitForm">确定</a-button>
-            </a-form-model>
-        </j-form-container>
-    </a-spin>
+            </a-form>
+        </div>
+        <!-- 查询区域-END -->
+
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--            <a-button type="primary" icon="download" @click="handleExportXls('支付接口配置')">导出</a-button>-->
+<!--            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--                <a-button type="primary" icon="import">导入</a-button>-->
+<!--            </a-upload>-->
+<!--            &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--            <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+<!--                <a-menu slot="overlay">-->
+<!--                    <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--                </a-menu>-->
+<!--                <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+
+                <a-button @click="batchDel" type="danger" icon="delete">批量删除</a-button>
+            </a-dropdown>
+        </div>
+
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
+
+            <a-table
+                    ref="table"
+                    size="middle"
+                    :scroll="{x:true}"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    class="j-table-force-nowrap"
+                    @change="handleTableChange">
+
+                <template slot="htmlSlot" slot-scope="text">
+                    <div v-html="text"></div>
+                </template>
+                <span slot="status" slot-scope="text,record">
+                    <a-tag v-if="text == 1" color="green">启用</a-tag>
+                    <a-tag v-else color="grey">关闭</a-tag>
+                </span>
+                <template slot="imgSlot" slot-scope="text,record">
+                    <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+                    <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+                </template>
+                <template slot="fileSlot" slot-scope="text">
+                    <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+                    <a-button
+                            v-else
+                            :ghost="true"
+                            type="primary"
+                            icon="download"
+                            size="small"
+                            @click="downloadFile(text)">
+                        下载
+                    </a-button>
+                </template>
+
+                <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+            </a-table>
+        </div>
+
+        <pay-interface-config-modal ref="modalForm" @ok="modalFormOk"></pay-interface-config-modal>
+    </a-card>
 </template>
 
 <script>
 
+    import '@/assets/less/TableExpand.less'
+    import { mixinDevice } from '@/utils/mixin'
+    import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import payInterfaceConfigModal from './modules/payInterfaceConfigModal'
     import { httpAction, getAction } from '@/api/manage'
-    import { validateDuplicateValue } from '@/utils/util'
-    import {getPayApiConfigInfo} from "../../../api/api";
 
     export default {
         name: 'payApiSettings',
+        mixins:[JeecgListMixin, mixinDevice],
         components: {
-        },
-        props: {
-            //表单禁用
-            disabled: {
-                type: Boolean,
-                default: false,
-                required: false
-            }
+            payInterfaceConfigModal
         },
         data () {
             return {
-                model:{
-                },
-                labelCol: {
-                    xs: { span: 24 },
-                    sm: { span: 3 },
-                },
-                wrapperCol: {
-                    xs: { span: 24 },
-                    sm: { span: 20 },
-                },
-                confirmLoading: false,
-                validatorRules: {
-                    status: [
-                        { required: true, message: '请选择是否启用!'},
-                    ],
-                    payTypeId: [
-                        { required: true, message: '请选择关联支付方式!'},
-                    ],
-                    merchantNo: [
-                        { required: true, message: '请输入商户号!'},
-                    ],
-                    terminalNo: [
-                        { required: true, message: '请输入终端号!'},
-                    ],
-                    token: [
-                        { required: true, message: '请输入TOKEN令牌!'},
-                    ],
-                },
+                description: '支付接口配置管理页面',
+                // 表头
+                columns: [
+                    {
+                        title:'支付方式',
+                        align:"center",
+                        dataIndex: 'payTypeId_dictText'
+                    },
+                    {
+                        title:'商户号',
+                        align:"center",
+                        dataIndex: 'merchantNo'
+                    },
+                    {
+                        title:'终端号',
+                        align:"center",
+                        dataIndex: 'terminalNo'
+                    },
+                    {
+                        title:'TOKEN令牌',
+                        align:"center",
+                        dataIndex: 'token'
+                    },
+                    {
+                        title:'状态',
+                        align:"center",
+                        dataIndex: 'status',
+                        scopedSlots: { customRender: 'status' },
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align:"center",
+                        fixed:"right",
+                        width:147,
+                        scopedSlots: { customRender: 'action' }
+                    }
+                ],
                 url: {
-                    add: "/business/busPayInterfaceConfig/add",
-                    edit: "/business/busPayInterfaceConfig/edit",
+                    list: "/business/busPayInterfaceConfig/list",
+                    delete: "/business/busPayInterfaceConfig/delete",
+                    deleteBatch: "/business/busPayInterfaceConfig/deleteBatch",
+                    exportXlsUrl: "/business/busPayInterfaceConfig/exportXls",
+                    importExcelUrl: "business/busPayInterfaceConfig/importExcel",
                     query_payType: "/business/busRoomPayType/queryList",
                 },
+                dictOptions:{},
+                superFieldList:[],
                 payTypeList:[]
             }
         },
-        computed: {
-            formDisabled(){
-                return this.disabled
-            },
-        },
-        created () {
-            //备份model原始值
-            this.modelDefault = JSON.parse(JSON.stringify(this.model));
-            var _info = JSON.parse(localStorage.getItem("storeInfo"));
-            setTimeout(() => {
-                getPayApiConfigInfo({
-                }).then(res => {
-                    console.log(res)
-                    if (res.code == 200 && res.result ) {
-                        var info = res.result
-                        this.model = {
-                            id: info.id,
-                            status :info.status.toString(),
-                            payTypeId:info.payTypeId,
-                            merchantNo:info.merchantNo,
-                            terminalNo:info.terminalNo,
-                            token:info.token
-                        };
-                    }
-                })
-            }, 100)
-
+        created() {
+            this.getSuperFieldList();
             getAction(this.url.query_payType,{}).then((res)=>{
                 if(res.success){
                     this.payTypeList = res.result
@@ -138,46 +392,30 @@
                 }
             })
         },
-        methods: {
-            add () {
-                this.edit(this.modelDefault);
-            },
-            edit (record) {
-                this.model = Object.assign({}, record);
-                this.visible = true;
+        computed: {
+            importExcelUrl: function(){
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
             },
-            submitForm () {
-                const that = this;
-                // 触发表单验证
-                this.$refs.form.validate(valid => {
-                    if (valid) {
-                        that.confirmLoading = true;
-                        let httpurl = '';
-                        let method = '';
-                        if(!this.model.id){
-                            httpurl+=this.url.add;
-                            method = 'post';
-                            var info = JSON.parse(localStorage.getItem("storeInfo"));
-                            this.model.hotelId = info.id;
-                        }else{
-                            httpurl+=this.url.edit;
-                            method = 'put';
-                        }
-                        httpAction(httpurl,this.model,method).then((res)=>{
-                            if(res.success){
-                                that.$message.success(res.message);
-                                that.$emit('ok');
-                                that.model.id = res.result.id
-                            }else{
-                                that.$message.warning(res.message);
-                            }
-                        }).finally(() => {
-                            that.confirmLoading = false;
-                        })
-                    }
-
-                })
+        },
+        methods: {
+            initDictConfig(){
             },
+            getSuperFieldList(){
+                let fieldList=[];
+                fieldList.push({type:'string',value:'tenantId',text:'关联租户'})
+                fieldList.push({type:'string',value:'hotelId',text:'关联酒店'})
+                fieldList.push({type:'string',value:'payTypeId',text:'关联支付方式'})
+                fieldList.push({type:'string',value:'merchantNo',text:'商户号'})
+                fieldList.push({type:'string',value:'terminalNo',text:'终端号'})
+                fieldList.push({type:'string',value:'token',text:'TOKEN令牌'})
+                fieldList.push({type:'int',value:'status',text:'状态(0-关闭；1-启用)'})
+                fieldList.push({type:'int',value:'minute',text:'预定超时时间'})
+                fieldList.push({type:'int',value:'delFlag',text:'删除状态(0-正常,1-已删除)'})
+                this.superFieldList = fieldList
+            }
         }
     }
 </script>
+<style scoped>
+    @import '~@assets/less/common.less';
+</style>

src/views/settings/components/roomModules/allDaysRoomFeeRule.vue

@@ -134,7 +134,10 @@
             </a-radio-group>
           </a-form-model-item>
           <!-- 统一配置分钟房费加收 -->
-          <div class="item-wrapper" v-if="model.timeOutRule == 1 && model.ruleType == 1">
+          <div
+            class="item-wrapper"
+            v-if="model.timeOutRule == 1 && model.ruleType == 1"
+          >
             <div class="wrapper-content">超时之后，每隔</div>
             <div class="wrapper-form-item" style="width: 98px">
               <a-form-model-item
@@ -143,12 +146,13 @@
                 :wrapperCol="wrapperCol"
                 prop="minute"
               >
-                <a-input-number :min="1" v-model="model.minute"></a-input-number>
+                <a-input-number
+                  :min="1"
+                  v-model="model.minute"
+                ></a-input-number>
               </a-form-model-item>
             </div>
-            <div class="wrapper-content">
-              分钟收取
-            </div>
+            <div class="wrapper-content">分钟收取</div>
             <div class="wrapper-form-item" style="width: 98px">
               <a-form-model-item
                 label=""
@@ -169,12 +173,13 @@
                 :wrapperCol="wrapperCol"
                 prop="moreThenMinute"
               >
-                <a-input-number :min="0" v-model="model.moreThenMinute"></a-input-number>
+                <a-input-number
+                  :min="0"
+                  v-model="model.moreThenMinute"
+                ></a-input-number>
               </a-form-model-item>
             </div>
-            <div class="wrapper-content">
-              分钟加收
-            </div>
+            <div class="wrapper-content">分钟加收</div>
             <div class="wrapper-form-item" style="width: 98px">
               <a-form-model-item
                 label=""
@@ -182,16 +187,86 @@
                 :wrapperCol="wrapperCol"
                 prop="moreThenPrice"
               >
-                <a-input-number :min="0" v-model="model.moreThenPrice"></a-input-number>
+                <a-input-number
+                  :min="0"
+                  v-model="model.moreThenPrice"
+                ></a-input-number>
               </a-form-model-item>
             </div>
-            <div class="wrapper-content">
-              元。
-            </div>
+            <div class="wrapper-content">元。</div>
           </div>
           <!-- 按房型配置分钟房费加收 -->
-          <div class="item-wrapper" v-if="model.timeOutRule == 1 && model.ruleType == 2">
-
+          <div v-if="model.timeOutRule == 1 && model.ruleType == 2">
+            <div
+              class="wrapper-layout-item"
+              v-for="item in layouts"
+              :key="item.id"
+            >
+              <div class="layout-item-header">
+                <div class="header-title">{{ item.name }}</div>
+              </div>
+              <div class="item-data-wrapper item-wrapper">
+                <div class="wrapper-content">超时之后，每隔</div>
+                <div class="wrapper-form-item" style="width: 98px">
+                  <a-form-model-item
+                    label=""
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    prop="minute"
+                  >
+                    <a-input-number
+                      :min="1"
+                      v-model="item.minute"
+                    ></a-input-number>
+                  </a-form-model-item>
+                </div>
+                <div class="wrapper-content">分钟收取</div>
+                <div class="wrapper-form-item" style="width: 98px">
+                  <a-form-model-item
+                    label=""
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    prop="price"
+                  >
+                    <a-input-number
+                      :min="0"
+                      v-model="item.price"
+                    ></a-input-number>
+                  </a-form-model-item>
+                </div>
+                <div class="wrapper-content">
+                  元，不足 {{ item.minute ? item.minute : 0 }} 分钟，超过
+                </div>
+                <div class="wrapper-form-item" style="width: 98px">
+                  <a-form-model-item
+                    label=""
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    prop="moreThenMinute"
+                  >
+                    <a-input-number
+                      :min="0"
+                      v-model="item.moreThenMinute"
+                    ></a-input-number>
+                  </a-form-model-item>
+                </div>
+                <div class="wrapper-content">分钟加收</div>
+                <div class="wrapper-form-item" style="width: 98px">
+                  <a-form-model-item
+                    label=""
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    prop="moreThenPrice"
+                  >
+                    <a-input-number
+                      :min="0"
+                      v-model="item.moreThenPrice"
+                    ></a-input-number>
+                  </a-form-model-item>
+                </div>
+                <div class="wrapper-content">元。</div>
+              </div>
+            </div>
           </div>
         </div>
 
@@ -223,8 +298,11 @@
 </template>
 
 <script>
-import { fetch } from "@/api/allDaysPriceRuleApi";
-import { getAllLayouts } from '@/api/roomLayout'
+import { fetch, save } from "@/api/allDaysPriceRuleApi";
+import { getAllLayouts } from "@/api/roomLayout";
+import moment from 'moment'
+
+let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"))
 export default {
   data() {
     return {
@@ -268,7 +346,7 @@ export default {
         minute: null,
         price: null,
         moreThenMinute: null,
-        moreThenPrice: null
+        moreThenPrice: null,
       },
       validatorRules: {
         enterTime: [
@@ -283,23 +361,110 @@ export default {
     };
   },
   mounted() {
-    this.loadLayouts()
-    this.loadRules();
+    this.loadLayouts();
+    
   },
   methods: {
     loadLayouts() {
-        getAllLayouts().then(res => {
-            if(res.code == 200) {
-                res.result.records.forEach
-                this.layouts = res.result.records
-            } 
-        })
+      getAllLayouts().then((res) => {
+        if (res.code == 200) {
+          res.result.records.forEach((s) => {
+            s["minute"] = null;
+            s["price"] = null;
+            s["moreThenMinute"] = null;
+            s["moreThenPrice"] = null;
+          });
+          this.layouts = res.result.records;
+          this.loadRules();
+        }
+      });
     },
     loadRules() {
-      fetch().then((res) => {});
+      fetch().then((res) => {
+        if(res.code == 200) {
+            res.result.cesAllDayPriceRule.enterTime = res.result.cesAllDayPriceRule.enterTime?moment(res.result.cesAllDayPriceRule.enterTime,"HH:mm").utcOffset(8):null
+            res.result.cesAllDayPriceRule.leaveTime = res.result.cesAllDayPriceRule.leaveTime?moment(res.result.cesAllDayPriceRule.leaveTime,"HH:mm").utcOffset(8):null
+            res.result.cesAllDayPriceRule.endTime = res.result.cesAllDayPriceRule.endTime?moment(res.result.cesAllDayPriceRule.endTime,"HH:mm").utcOffset(8):null
+            this.model = res.result.cesAllDayPriceRule
+
+            if(res.result.cesAllMinutes && res.result.cesAllMinutes.length > 0) {
+                let arrs = res.result.cesAllMinutes
+                this.layouts.forEach(s => {
+                    let index = arrs.findIndex(a => a.roomLayoutId == s.id)
+                    if(index > -1) {
+                        let item = arrs[index]
+                        s['mId'] = item.id
+                        s.minute = item.minute
+                        s.price = item.price
+                        s.moreThenMinute = item.moreThenMinute
+                        s.moreThenPrice = item.moreThenPrice
+                    }
+                })
+            }
+           
+        }
+      });
+    },
+    reload() {
+        this.confirmLoading = true
+        this.loadLayouts()
+        setTimeout(_ => {
+            this.$message.success('刷新成功')
+            this.confirmLoading = false
+        },800)
+        
+    },
+    save() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true;
+          let layoutRules = []
+          if(this.model.timeOutRule == 1 && this.model.ruleType == 2) {
+            this.layouts.forEach(s => {
+                let pushItem = {
+                    hotelId: hotelInfo.id,
+                    roomLayoutId: s.id,
+                    minute: s.minute,
+                    price: s.price,
+                    moreThenMinute: s.moreThenMinute,
+                    moreThenPrice: s.moreThenPrice,
+                }
+                if(s.mId) {
+                    pushItem['id'] = s.mId
+                }
+                layoutRules.push(pushItem)
+            })
+          }
+          let param = {
+            hotelId:hotelInfo.id,
+            enterTime: moment(this.model.enterTime,"HH:mm").utcOffset(8).format("HH:mm"),
+            leaveTime: moment(this.model.leaveTime,"HH:mm").utcOffset(8).format("HH:mm"),
+            timeOutRule: this.model.timeOutRule,
+            ruleType: this.model.ruleType,
+            minute: this.model.minute,
+            price: this.model.price,
+            moreThenMinute: this.model.moreThenMinute,
+            moreThenPrice: this.model.moreThenPrice,
+            endTime: moment(this.model.endTime,"HH:mm").utcOffset(8).format("HH:mm") ,
+            dayTime: this.model.dayTime,
+            roomLayoutRules: layoutRules
+          }
+          if(this.model.id) {
+            param['id'] = this.model.id
+          }
+          save(param).then(res => {
+            if(res.code == 200) {
+                this.$message.success("保存成功")
+                this.loadRules()
+            }
+          }).finally(_ => {
+            that.confirmLoading = false;
+          })
+        }
+      });
     },
-    reload() {},
-    save() {},
   },
 };
 </script>
@@ -319,4 +484,22 @@ export default {
   height: 38px;
   /* margin-top: 22px; */
 }
+.item-data-wrapper {
+  margin-top: 0 !important;
+  border-top: 2px solid #1890ff;
+  width: fit-content;
+  padding: 0 40px;
+  background-color: #1890ff;
+  border-top-right-radius: 4px;
+  color: white;
+}
+.header-title {
+  font-weight: 600;
+  width: fit-content;
+  padding: 10px 20px;
+  background-color: #1890ff;
+  color: white;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
 </style>

src/views/settings/components/roomModules/hourRoomRule/hourLayoutRelation.vue

@@ -0,0 +1,110 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <div>
+      <div :style="{ borderBottom: '1px solid #E9E9E9' }">
+        <a-checkbox :checked="checkAll" @change="onCheckAllChange">
+          全选
+        </a-checkbox>
+      </div>
+      <br />
+      <a-checkbox-group v-model="model.layoutIds" @change="onChange">
+        <a-checkbox :value="item.id" v-for="item in layouts" :key="item.id">
+          {{ item.name }}
+        </a-checkbox>
+      </a-checkbox-group>
+    </div>
+  </j-modal>
+</template>
+    
+    <script>
+import { getAllLayouts } from "@/api/roomLayout";
+import { editHourRule } from '@/api/allDaysPriceRuleApi.js' 
+export default {
+  name: "hourRoomForm",
+  components: {},
+  data() {
+    return {
+      checkAll: false,
+      model: {
+        id: null,
+        layoutIds: [],
+      },
+      title: "关联房型",
+      width: 1200,
+      visible: false,
+      disableSubmit: false,
+      layouts: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    setData(data) {
+      getAllLayouts().then((res) => {
+        if (res.code == 200) {
+          this.layouts = res.result.records;
+          this.visible = true;
+          this.model = JSON.parse(JSON.stringify(data));
+          this.model.layoutIds =this.model.layoutIds? this.model.layoutIds.split(","):[]
+          this.checkAll = this.isAllInArr()
+        }
+      });
+    },
+    onChange(checkedList) {
+      this.checkAll = (checkedList.length === this.layouts.length);
+    },
+    onCheckAllChange(e) {
+        if(e.target.checked) {
+            this.model.layoutIds = this.layouts.map(s=>s.id)
+        } else {
+            this.model.layoutIds = []
+        }
+        this.checkAll = e.target.checked
+    },
+    isAllInArr() {
+        let result = true
+        this.layouts.forEach(s=>{
+            let index = this.model.layoutIds.findIndex(a=>a==s.id)
+            if(index == -1) {
+                result = false
+            }
+        })
+        return result
+    },
+    edit(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      });
+    },
+    close() {
+      this.$emit("close");
+      this.visible = false;
+    },
+    handleOk() {
+        let param = JSON.parse(JSON.stringify(this.model))
+        param.layoutIds = (param.layoutIds||[]).toString()
+        editHourRule(param).then(res => {
+                if(res.code == 200 )  {
+                    // this.confirmLoading = false
+                    this.$message.success('保存成功')
+                    this.$emit('ok')
+                }
+            }).finally(_ => {
+                // this.confirmLoading = false
+            })
+    },
+    handleCancel() {
+      this.close();
+    },
+  },
+};
+</script>

src/views/settings/components/roomModules/hourRoomRule/hourRoomForm.vue

@@ -0,0 +1,356 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model
+        labelAlign="left"
+        ref="form"
+        :model="model"
+        layout="horizontal"
+        :rules="validatorRules"
+        slot="detail"
+      >
+      <a-form-model-item
+          label="名称"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="hourRoomName"
+        >
+          <a-input
+            style="width: 50%"
+            v-model="model.hourRoomName"
+            :min="1"
+            placeholder="名称"
+          />
+        </a-form-model-item>
+        <div class="item-wrapper">
+          <div class="wrapper-content"><span style="color:red;">*</span>1、开房后</div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="afterOpenRoom"
+            >
+             <a-input-number v-model="model.afterOpenRoom" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟内按
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="afterOpenRoomPay"
+            >
+             <a-input-number v-model="model.afterOpenRoomPay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            元收取
+          </div>
+        </div>
+        <div class="item-wrapper">
+          <div class="wrapper-content"><span style="color:red;">*</span>2、超时之后每</div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="exceedTime"
+            >
+             <a-input-number v-model="model.exceedTime" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟收取
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="exceedPay"
+            >
+             <a-input-number v-model="model.exceedPay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            元，不足
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="exceedTime"
+            >
+             <a-input-number v-model="model.exceedTime" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟，超过
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="notReachExceedTime"
+            >
+             <a-input-number v-model="model.notReachExceedTime" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟加收
+          </div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="notReachExceedTimePay"
+            >
+             <a-input-number v-model="model.notReachExceedTimePay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            元
+          </div>
+        </div>
+        <div class="item-wrapper">
+          <div class="wrapper-content"><span style="color:red;">*</span>3、封顶；</div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="maxExtraPay"
+            >
+             <a-input-number v-model="model.maxExtraPay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            元封顶 注意：0元视为不封顶
+          </div>
+        </div>
+        <div class="item-wrapper">
+          <div class="wrapper-content"><span style="color:red;">*</span>4、消费超过</div>
+          <div class="wrapper-form-item" style="width: 98px">
+            <a-form-model-item
+              label=""
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="limitTimeTransferAllDay"
+            >
+             <a-input-number v-model="model.limitTimeTransferAllDay" placeholder="请填写" />
+            </a-form-model-item>
+          </div>
+          <div class="wrapper-content">
+            分钟，自动转为全天房 注意：0分钟视为不自动转全天房
+          </div>
+        </div>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+<script>
+import { getRoomPlans, getSelectList } from "@/api/api";
+import { httpAction, getAction } from "@/api/manage";
+import { validateDuplicateValue } from "@/utils/util";
+import { saveHourRule,editHourRule } from '@/api/allDaysPriceRuleApi.js' 
+
+export default {
+  name: "BusMarketMemberForm",
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    return {
+      model: {
+        id: "",
+        hourRoomName: "",
+        afterOpenRoom: 60, // 钟点时间周期
+        afterOpenRoomPay: 108, //钟点单价
+        exceedTime: 60, // 超时周期
+        exceedPay: 20, //超时周期付费
+        notReachExceedTime:20, // 未超时周期
+        notReachExceedTimePay: 10,// 未超时周期付费
+        maxExtraPay: 0,// 封顶
+        limitTimeTransferAllDay: 0, //超时多少分钟自动转全天房 0 不自动转
+      },
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 1 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+        hourRoomName: [{ required: true, message: "请输入!" }],
+        afterOpenRoom: [{ required: true, message: "请输入!" }],
+        afterOpenRoomPay: [{ required: true, message: "请输入!" }],
+        exceedTime: [{ required: true, message: "请输入!" }],
+        exceedPay: [{ required: true, message: "请输入!" }],
+        notReachExceedTime: [{ required: true, message: "请输入!" }],
+        notReachExceedTimePay: [{ required: true, message: "请输入!" }],
+        maxExtraPay: [{ required: true, message: "请输入!" }],
+        limitTimeTransferAllDay: [{ required: true, message: "请输入!" }],
+      },
+      url: {
+        add: "/rooms/cesRoomLayout/save",
+        edit: "/rooms/cesRoomLayout/modify",
+        queryById: "/rooms/cesRoomLayout/queryById",
+      },
+      iconChooseVisible: false,
+      roomPlans: [],
+      members: [],
+    };
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled;
+    },
+  },
+  created() {
+    var _info = JSON.parse(localStorage.getItem("storeInfo"));
+    if (_info) {
+      this.model.hotelId = _info.id;
+      this.initData();
+    }
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    initData() {
+      getRoomPlans(this.model.hotelId, null).then((res) => {
+        if (res.success) {
+          this.roomPlans = res.result;
+        }
+      });
+    },
+    selectIcons() {
+      this.iconChooseVisible = true;
+    },
+    handleIconCancel() {
+      this.iconChooseVisible = false;
+    },
+    handleIconChoose(value) {
+      console.log(value);
+      this.model.icon = value;
+      this.iconChooseVisible = false;
+    },
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record);
+      this.visible = true;
+      getSelectList({ id: this.model.id }).then((res) => {
+        if (res.success) {
+          this.members = res.result;
+        }
+      });
+    },
+    submitForm() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true;
+          if(this.model.id) {
+            editHourRule(this.model).then(res => {
+                if(res.code == 200 )  {
+                    this.confirmLoading = false
+                    this.model = {
+                        id: "",
+                        hourRoomName: "",
+                        afterOpenRoom: 60, // 钟点时间周期
+                        afterOpenRoomPay: 108, //钟点单价
+                        exceedTime: 60, // 超时周期
+                        exceedPay: 20, //超时周期付费
+                        notReachExceedTime:20, // 未超时周期
+                        notReachExceedTimePay: 10,// 未超时周期付费
+                        maxExtraPay: 0,// 封顶
+                        limitTimeTransferAllDay: 0, //超时多少分钟自动转全天房 0 不自动转
+                    }
+                    this.$message.success('保存成功')
+                    this.$emit('ok')
+                }
+            }).finally(_ => {
+                this.confirmLoading = false
+            })
+            return
+          }
+          saveHourRule(this.model).then(res => {
+            if(res.code == 200 )  {
+                this.confirmLoading = false
+                this.model = {
+                    id: "",
+                    hourRoomName: "",
+                    afterOpenRoom: 60, // 钟点时间周期
+                    afterOpenRoomPay: 108, //钟点单价
+                    exceedTime: 60, // 超时周期
+                    exceedPay: 20, //超时周期付费
+                    notReachExceedTime:20, // 未超时周期
+                    notReachExceedTimePay: 10,// 未超时周期付费
+                    maxExtraPay: 0,// 封顶
+                    limitTimeTransferAllDay: 0, //超时多少分钟自动转全天房 0 不自动转
+                }
+                this.$message.success('保存成功')
+                this.$emit('ok')
+            }
+          }).finally(_ => {
+            this.confirmLoading = false
+          })
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="css" scoped>
+.avatar-uploader > .ant-upload {
+  width: 104px;
+  height: 104px;
+}
+/deep/ .ant-form-explain {
+  width: 200% !important;
+}
+.item-wrapper {
+  display: flex ;
+  width: 100%;
+  align-items: center;
+  height: 50px;
+  margin-top: 22px;
+  margin-bottom: 22px;
+}
+.wrapper-form-item {
+  height: 38px;
+  /* margin-top: 22px; */
+}
+.item-data-wrapper {
+  margin-top: 0 !important;
+  border-top: 2px solid #1890ff;
+  width: fit-content;
+  padding: 0 40px;
+  background-color: #1890ff;
+  border-top-right-radius: 4px;
+  color: white;
+}
+.header-title {
+  font-weight: 600;
+  width: fit-content;
+  padding: 10px 20px;
+  background-color: #1890ff;
+  color: white;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+</style>

src/views/settings/components/roomModules/hourRoomRule/hourRoomFormModal.vue

@@ -0,0 +1,60 @@
+<template>
+    <j-modal
+      :title="title"
+      :width="width"
+      :visible="visible"
+      switchFullscreen
+      @ok="handleOk"
+      :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
+      @cancel="handleCancel"
+      cancelText="关闭"
+    >
+    <v-form ref="realForm" @ok="submitCallback"></v-form>
+    </j-modal>
+  </template>
+    
+    <script>
+    import vForm from './hourRoomForm.vue'
+  export default {
+    name: "hourRoomForm",
+    components: {
+        vForm
+    },
+    data() {
+      return {
+        title: "",
+        width: 1200,
+        visible: false,
+        disableSubmit: false,
+      };
+    },
+    methods: {
+      add() {
+        this.visible = true;
+        this.$nextTick(() => {
+          this.$refs.realForm.add();
+        });
+      },
+      edit(record) {
+        this.visible = true;
+        this.$nextTick(() => {
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close() {
+        this.$emit("close");
+        this.visible = false;
+      },
+      handleOk() {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback() {
+        this.$emit("ok");
+        this.visible = false;
+      },
+      handleCancel() {
+        this.close();
+      },
+    },
+  };
+  </script>

src/views/settings/components/roomModules/hourRoomRule/table.vue

@@ -0,0 +1,305 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :span="3">
+            <a-form-item label="">
+              <a-input
+                placeholder="名称"
+                v-model="queryParam.hourRoomName"
+                style="width: 200px"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <span
+              style="float: left; overflow: hidden"
+              class="table-page-search-submitButtons"
+            >
+            <a-button type="primary" @click="searchQuery" icon="search"
+                >查询</a-button
+              >
+              <a-button
+                type="primary"
+                @click="searchReset"
+                icon="reload"
+                style="margin-left: 8px"
+                >重置</a-button
+              >
+            
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down"
+        /></a-button>
+      </a-dropdown>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{ x: true }"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{
+          selectedRowKeys: selectedRowKeys,
+          onChange: onSelectChange,
+        }"
+        class="j-table-force-nowrap"
+        @change="handleTableChange"
+      >
+      <template slot="idSlot" slot-scope="text, record">
+            <div style="text-align:left;">1、开房后{{ record.afterOpenRoom?record.afterOpenRoom:0 }}分钟内按{{ record.afterOpenRoomPay?record.afterOpenRoomPay:0 }}元收取</div>
+            <div style="text-align:left;">
+                2、超时之后每{{ record.exceedTime?record.exceedTime:0 }}分钟收取{{ record.exceedPay?record.exceedPay:0 }}元，
+                不足{{ record.exceedTime?record.exceedTime:0 }}分钟，超过{{ record.notReachExceedTime?record.notReachExceedTime:0 }}分钟加收{{ record.notReachExceedTimePay?record.notReachExceedTimePay:0 }}元
+            </div>
+            <div style="text-align:left;">
+                3、 {{ record.maxExtraPay?record.maxExtraPay:0 }}元封顶 注意：0元视为不封顶
+            </div>
+            <div style="text-align:left;">
+                4、消费超过{{ record.limitTimeTransferAllDay?record.limitTimeTransferAllDay:0 }}分钟，自动转为全天房 注意：0分钟视为不自动转全天房
+            </div>
+      </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a @click="handleRelation(record)">关联</a>
+          <a-divider type="vertical" />
+          <a-popconfirm
+                  title="确定删除吗?"
+                  @confirm="() => handleDelete(record.id)"
+                >
+                  <a>删除</a>
+                </a-popconfirm>
+
+          
+        </span>
+      </a-table>
+    </div>
+    <modal-form ref="modalForm" @ok="modalFormOk"></modal-form>
+    <relation-form ref="relationForm" @ok="relationOk"></relation-form>
+  </a-card>
+</template>
+  
+<script>
+import { JeecgListMixin } from "@/mixins/JeecgListMixin";
+import modalForm from "./hourRoomFormModal.vue"; // todo roomLayoutForm 需要替换成房型的表单弹窗
+import relationForm from "./hourLayoutRelation.vue"; // todo roomLayoutForm 需要替换成房型的表单弹窗
+// import RoomLayoutDetailModal from "./RoomLayoutFormDetailModal.vue";
+
+// import RoomLayoutPriceModal from "./RoomLayoutPriceModal.vue";
+
+import { modifyAppState } from "@/api/roomLayout";
+import { filterObj } from "@/utils/util";
+let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"));
+export default {
+  name: "roomLayoutList",
+  mixins: [JeecgListMixin],
+  components: {
+    modalForm,
+    relationForm
+    // RoomLayoutPriceModal,
+    // RoomLayoutDetailModal,
+  },
+  data() {
+    return {
+      queryParam: {
+        hourRoomName:''
+      },
+      // 分页参数
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ["10", "20", "30"],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条";
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0,
+      },
+      // 表头
+      columns: [
+        {
+          title: "商家",
+          align: "center",
+          dataIndex: "hotelName",
+        },
+        {
+          title: "名称",
+          align: "center",
+          dataIndex: "hourRoomName",
+        },
+        {
+          title: "规则",
+          align: "center",
+          dataIndex: "id",
+          scopedSlots: { customRender: "idSlot" },
+        },
+        {
+          title: "更新时间",
+          align: "center",
+          dataIndex: "updateAt",
+        },
+        {
+          title: "操作",
+          dataIndex: "action",
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: { customRender: "action" },
+        },
+      ],
+      url: {
+        // list: 'org.jeecg.modules.business/busMarketMember/list',
+        list: "/rooms/cesHourRoomRule/list",
+        delete: "/rooms/cesHourRoomRule/delete",
+        deleteBatch: "/rooms/cesHourRoomRule/batchDelete",
+        exportXlsUrl: "/rooms/cesRoomLayout/exportXls",
+        importExcelUrl: "rooms/cesRoomLayout/importExcel",
+      },
+
+      dictOptions: {},
+      superFieldList: [],
+      selectedRowKeys: [],
+      isorter: {
+        column: "createTime",
+        order: "desc",
+      },
+    };
+  },
+  created() {
+    // this.loadData()
+  },
+  methods: {
+    handleRelation(data) {
+        this.$refs.relationForm.setData(data);
+    },
+    relationOk() {
+        this.$refs.relationForm.visible = false
+        this.loadData()
+    },
+    onSaveOk() {
+      this.loadData();
+    },
+    onPriceSave() {},
+    handlePriceManager(record) {
+      this.$refs.priceModal.setRaw(record.id, record.name);
+      this.$refs.priceModal.visible = true;
+    },
+    handleDetailSetting(record) {
+      this.$refs.detailModal.setRaw(record);
+      this.$refs.detailModal.visible = true;
+    },
+    changeState(e) {
+      console.log(e);
+    },
+    changeAppState(e, param) {
+      modifyAppState(param).then((res) => {
+        if (res.code == 200) {
+          this.loadData();
+        }
+      });
+    },
+    getAvatarView: function (avatar) {
+      return getFileAccessHttpUrl(avatar);
+    },
+
+    batchFrozen: function (status) {
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning("请选择一条记录！");
+        return false;
+      } else {
+        let ids = "";
+        let that = this;
+        let isAdmin = false;
+        that.selectionRows.forEach(function (row) {
+          if (row.username == "admin") {
+            isAdmin = true;
+          }
+        });
+        if (isAdmin) {
+          that.$message.warning("管理员账号不允许此操作,请重新选择！");
+          return;
+        }
+        that.selectedRowKeys.forEach(function (val) {
+          ids += val + ",";
+        });
+        that.$confirm({
+          title: "确认操作",
+          content: "是否" + (status == 1 ? "解冻" : "冻结") + "选中账号?",
+          onOk: function () {
+            frozenBatch({ ids: ids, status: status }).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.loadData();
+                that.onClearSelected();
+              } else {
+                that.$message.warning(res.message);
+              }
+            });
+          },
+        });
+      }
+    },
+    handleMenuClick(e) {
+      if (e.key == 1) {
+        this.batchDel();
+      } else if (e.key == 2) {
+        this.batchFrozen(2);
+      } else if (e.key == 3) {
+        this.batchFrozen(1);
+      }
+    },
+    handleFrozen: function (id, status, username) {
+      let that = this;
+      //TODO 后台校验管理员角色
+      if ("admin" == username) {
+        that.$message.warning("管理员账号不允许此操作！");
+        return;
+      }
+      frozenBatch({ ids: id, status: status }).then((res) => {
+        if (res.success) {
+          that.$message.success(res.message);
+          that.loadData();
+        } else {
+          that.$message.warning(res.message);
+        }
+      });
+    },
+    handleChangePassword(username) {
+      this.$refs.passwordmodal.show(username);
+    },
+    passwordModalOk() {
+      //TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
+    },
+    onSyncFinally({ isToLocal }) {
+      // 同步到本地时刷新下数据
+      if (isToLocal) {
+        this.loadData();
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+@import "~@assets/less/common.less";
+</style>

src/views/settings/components/roomModules/marketObjectiveList.vue

@@ -0,0 +1,277 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="4" :sm="6">
+            <a-form-item label="选择年度">
+              <a-date-picker
+                             mode="year"
+                             placeholder="请选择年份"
+                             format='YYYY'
+                             v-model="queryParam.year"
+                             :open='yearShowOne'
+                             @openChange="openChangeOne"
+                             @panelChange="panelChangeOne" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="6">
+             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+             </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('销售目标')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+<!--        <a-menu slot="overlay">-->
+<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--        </a-menu>-->
+<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+<!--      </a-dropdown>-->
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        :columns="columns"
+        rowKey="month"
+        :dataSource="dataSource"
+        :pagination="false"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+          <template slot="turnoverSlot" slot-scope="text,record">
+              <a-input-number v-model="record.turnover"  style="width: 70%" :min="0" :step="1" :precision="2"/>
+          </template>
+          <template slot="rentalRateSlot" slot-scope="text,record">
+<!--              <a-input-number :min="0" :step="1" :precision="2"-->
+<!--                              :formatter="value => `${value}%`" :parser="value => value.replace('%', '')"-->
+<!--                              addon-after=".com">-->
+<!--                  <a-icon slot="prefix" type="user" />-->
+<!--              </a-input-number>-->
+<!--              <a-input addon-after="%" />-->
+              <a-input-group compact>
+                  <a-input-number v-model="record.rentalRate" style="width: 60%" :min="0" :step="1" :precision="2"/>
+                  <a-input disabled value="%" style="width: 40px;"/>
+              </a-input-group>
+<!--              <div style="display: flex;flex-direction: row">-->
+<!--                  <div style="flex: 3">-->
+<!--                      <a-input-number :min="0" :step="1" :precision="2"/>-->
+<!--                  </div>-->
+<!--                  <div style="flex: 1">-->
+<!--                      <a-input disabled="" value="%"/>-->
+<!--                  </div>-->
+<!--              </div>-->
+          </template>
+          <template slot="roomPriceSlot" slot-scope="text,record">
+              <a-input-number v-model="record.roomPrice" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          </template>
+          <template slot="revperSlot" slot-scope="text,record">
+              <a-input-number v-model="record.revper" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          </template>
+          <template slot="nightSlot" slot-scope="text,record">
+              <a-input-number v-model="record.night" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          </template>
+      </a-table>
+    </div>
+    <a-button type="primary" @click="submitData" style="margin-top: 20px">保存</a-button>
+<!--    <bus-market-objective-modal ref="modalForm" @ok="modalFormOk"></bus-market-objective-modal>-->
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import moment from "moment";
+  import { httpAction, getAction } from '@/api/manage'
+  // import BusMarketObjectiveModal from './modules/BusMarketObjectiveModal'
+
+  export default {
+      name: 'marketObjectiveList',
+      mixins: [JeecgListMixin, mixinDevice],
+      components: {
+          // BusMarketObjectiveModal
+      },
+      data() {
+          return {
+              description: '销售目标管理页面',
+              // 表头
+              columns: [
+                  {
+                      title: '月份',
+                      align: "center",
+                      dataIndex: 'month',
+                      width:200
+                  },
+                  {
+                      title: '营业额销售目标',
+                      align: "center",
+                      dataIndex: 'turnover',
+                      scopedSlots: { customRender: 'turnoverSlot' }
+                  },
+                  {
+                      title: '出租率销售目标',
+                      align: "center",
+                      dataIndex: 'rentalRate',
+                      scopedSlots: { customRender: 'rentalRateSlot' }
+                  },
+                  {
+                      title: '平均房价销售目标',
+                      align: "center",
+                      dataIndex: 'roomPrice',
+                      scopedSlots: { customRender: 'roomPriceSlot' }
+                  },
+                  {
+                      title: 'RevPer销售目标',
+                      align: "center",
+                      dataIndex: 'revper',
+                      scopedSlots: { customRender: 'revperSlot' }
+                  },
+                  {
+                      title: '夜间数销售目标',
+                      align: "center",
+                      dataIndex: 'night',
+                      scopedSlots: { customRender: 'nightSlot' }
+                  },
+              ],
+              url: {
+                  list: "/business/busMarketObjective/queryList",
+                  delete: "/business/busMarketObjective/delete",
+                  deleteBatch: "/business/busMarketObjective/deleteBatch",
+                  exportXlsUrl: "/business/busMarketObjective/exportXls",
+                  importExcelUrl: "business/busMarketObjective/importExcel",
+                  batchAddOrUpdate: "/business/busMarketObjective/batchAddOrUpdate",
+              },
+              dictOptions: {},
+              superFieldList: [],
+              yearShowOne: false,
+              hotelId:''
+          }
+      },
+      beforeCreate() {
+
+      },
+      created() {
+          this.getSuperFieldList();
+          this.queryParam.year = moment(new Date().getFullYear(),'YYYY')
+          //new Date().getFullYear();//
+      },
+      mounted(){
+          console.log(this.dataSource)
+          // this.$nextTick(() => {
+          //     console.log(this.$refs.table.dataSource)
+          // })
+          var info = JSON.parse(localStorage.getItem("storeInfo"));
+          this.hotelId = info.id;
+      },
+      updated () {
+          // this.handleAddStatistics()
+          console.log(this.dataSource)
+      },
+      computed: {
+          importExcelUrl: function () {
+              return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+          },
+      },
+      methods: {
+          initDictConfig() {
+          },
+          getSuperFieldList() {
+              let fieldList = [];
+              fieldList.push({type: 'string', value: 'tenantId', text: '关联租户'})
+              fieldList.push({type: 'string', value: 'hotelId', text: '关联酒店'})
+              fieldList.push({type: 'int', value: 'year', text: '年份'})
+              fieldList.push({type: 'string', value: 'month', text: '月份'})
+              fieldList.push({type: 'number', value: 'turnover', text: '营业额销售目标'})
+              fieldList.push({type: 'number', value: 'rentalRate', text: '出租率销售目标'})
+              fieldList.push({type: 'number', value: 'roomPrice', text: '平均房价销售目标'})
+              fieldList.push({type: 'number', value: 'revper', text: 'RevPer销售目标'})
+              fieldList.push({type: 'number', value: 'night', text: '夜间数销售目标'})
+              fieldList.push({type: 'string', value: 'json', text: 'json'})
+              fieldList.push({type: 'int', value: 'delFlag', text: '删除状态(0-正常,1-已删除)'})
+              this.superFieldList = fieldList
+          },
+          // 弹出日历和关闭日历的回调
+          openChangeOne(status) {
+              if (status) {
+                  this.yearShowOne = true
+              }
+          },
+          // 得到年份选择器的值
+          panelChangeOne(value) {
+              this.queryParam.year = moment(new Date(value)).format('YYYY');
+              this.yearShowOne = false;
+          },
+          handleAddStatistics() {
+              console.log(this.$refs.table.dataSource)
+              const { count, dataSource } = this.$refs.table;
+              const newData = {
+                  key: count,
+                  month: '合计',
+                  turnover: '0.00',
+                  rentalRate: '0.00',
+                  roomPrice: '0.00',
+                  revper: '0.00',
+                  night: '0.00',
+              };
+              this.$refs.table.dataSource = [...dataSource, newData];
+              // this.$refs.table.count = count + 1;
+          },
+          submitData() {
+              var _dataSource = this.$refs.table.dataSource
+              _dataSource.forEach(t=>{
+                  t.hotelId = this.hotelId
+              })
+              var data = JSON.stringify(_dataSource)
+              console.log(data)
+              const that = this;
+              that.confirmLoading = true;
+              httpAction(this.url.batchAddOrUpdate, _dataSource, 'POST').then((res) => {
+                  if (res.success) {
+                      that.$message.success(res.message);
+                      that.$emit('ok');
+
+                      if(that.queryParam.year._isAMomentObject){
+                          that.queryParam.year = that.queryParam.year.format('YYYY')
+                      }
+                      that.loadData();
+                  } else {
+                      that.$message.warning(res.message);
+                  }
+              }).finally(() => {
+                  that.confirmLoading = false;
+              })
+          }
+      }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/settings/components/roomModules/roomLayoutList.vue

@@ -6,7 +6,7 @@
                 <a-row :gutter="24">
                     <a-col :span="6">
                         <a-form-item label="房型名称">
-                            <j-input placeholder="房型名称" v-model="queryParam.name" style="width: 200px"></j-input>
+                            <a-input placeholder="房型名称" v-model="queryParam.name" style="width: 200px"></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="8">

src/views/settings/components/waiterSettings.vue

@@ -26,7 +26,8 @@
                     </a-col>
                     <a-col :md="4" :sm="6">
                         <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                          <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
                         </span>
                     </a-col>
                 </a-row>
@@ -150,6 +151,16 @@
                         dataIndex: 'sex_dictText',
                     },
                     {
+                        title:'身份证号',
+                        align:"center",
+                        dataIndex: 'idCard'
+                    },
+                    {
+                        title:'手机号',
+                        align:"center",
+                        dataIndex: 'phone'
+                    },
+                    {
                         title:'状态',
                         align:"center",
                         dataIndex: 'status',

src/views/settings/roomSettings.vue

@@ -35,6 +35,7 @@
                     <a-icon type="history" />
                     钟点房计费
                 </span>
+                <hour-room-rule-list></hour-room-rule-list>
             </a-tab-pane>
             <a-tab-pane key="6">
                 <span slot="tab">
@@ -60,6 +61,7 @@
                     <a-icon type="flag" />
                     销售目标设置
                 </span>
+                <market-objective-list></market-objective-list>
             </a-tab-pane>
             <a-tab-pane key="10">
                 <span slot="tab">
@@ -79,14 +81,18 @@ import roomNumList from "./components/roomModules/roomNumSettings/roomNumList.vu
 import allDaysRule from './components/roomModules/allDaysRoomFeeRule.vue'
 import MealCouponList from "./components/roomModules/mealCouponList";
 import ServiceRepairList from "./components/roomModules/serviceRepairList";
+import hourRoomRuleList from './components/roomModules/hourRoomRule/table.vue'
+import MarketObjectiveList from "./components/roomModules/marketObjectiveList";
 export default {
     components: {
+        MarketObjectiveList,
         ServiceRepairList,
         MealCouponList,
         roomLayoutList,
         goodList,
         roomNumList,
         allDaysRule, // 全天房计费规则tabContent
+        hourRoomRuleList
     },
     data() {
         return {

src/views/settings/systemInfo.vue

@@ -42,6 +42,10 @@
                     </a-card>
                     </a-form-item>
                     <a-button type="primary" @click="toClearBusinessData()">确定清除</a-button>
+<!--                    <a-popconfirm title="此操作将永久删除选中数据，是否继续?" @confirm="() => toClearBusinessData()">-->
+<!--                        <a-button type="primary">确定清除</a-button>-->
+<!--                    </a-popconfirm>-->
+
                 </div>
             </a-tab-pane>
             <a-tab-pane key="6">
@@ -130,9 +134,21 @@
         },
         methods:{
             toClearBusinessData(){
-                if (this.clearBusiness){
-                    console.log('清除数据')
-                }
+                var _this = this;
+                this.$confirm({
+                    title: '提示',
+                    content: '此操作将永久删除选中数据，是否继续?',
+                    okText: '确认',
+                    cancelText: '取消',
+                    onOk() {
+                        if (_this.clearBusiness){
+                            console.log('清除数据')
+                        }
+                    },
+                    onCancel() {
+                        console.log('Cancel');
+                    },
+                });
             }
         }
     }